From 2e6a533bd560345753501c192153ebfdd0dc14e0 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Tue, 2 Jul 2013 21:40:08 +0200 Subject: [PATCH 01/22] mcwm: added config.h and needed scripts --- srcpkgs/mcwm/files/config.h | 98 +++++++++++++++++++++++++++++++++++++ srcpkgs/mcwm/template | 6 ++- 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mcwm/files/config.h diff --git a/srcpkgs/mcwm/files/config.h b/srcpkgs/mcwm/files/config.h new file mode 100644 index 00000000000..0bfb3c3c765 --- /dev/null +++ b/srcpkgs/mcwm/files/config.h @@ -0,0 +1,98 @@ +/* User configurable stuff. */ + +/* + * Move this many pixels when moving or resizing with keyboard unless + * the window has hints saying otherwise. + */ +#define MOVE_STEP 32 + +/* + * Use this modifier combined with other keys to control wm from + * keyboard. Default is Mod4, which on my keyboard is the Alt key but + * is usually the Windows key on more normal keyboard layouts. + */ +#define MODKEY XCB_MOD_MASK_4 + +/* Extra modifier for resizing. Default is Shift. */ +#define SHIFTMOD XCB_MOD_MASK_SHIFT + +/* + * Modifier key to use with mouse buttons. Default Mod1, Meta on my + * keyboard. + */ +#define MOUSEMODKEY XCB_MOD_MASK_1 + +/* + * Start this program when pressing MODKEY + USERKEY_TERMINAL. Needs + * to be in $PATH. + * + * Change to "xterm" if you're feeling conservative. + * + * Can be set from command line with "-t program". + */ +#define TERMINAL "urxvt" + +/* + * Do we allow windows to be iconified? Set to true if you want this + * behaviour to be default. Can also be set by calling mcwm with -i. + */ +#define ALLOWICONS false + +/* + * Start these programs when pressing MOUSEMODKEY and mouse buttons on + * root window. + */ +#define MOUSE1 "" +#define MOUSE2 "" +#define MOUSE3 "mcmenu" + +/* + * Default colour on border for focused windows. Can be set from + * command line with "-f colour". + */ +#define FOCUSCOL "chocolate1" + +/* Ditto for unfocused. Use "-u colour". */ +#define UNFOCUSCOL "grey40" + +/* Ditto for fixed windows. Use "-x colour". */ +#define FIXEDCOL "grey90" + +/* Default width of border window, in pixels. Used unless -b width. */ +#define BORDERWIDTH 1 + +/* + * Keysym codes for window operations. Look in X11/keysymdefs.h for + * actual symbols. Use XK_VoidSymbol to disable a function. + */ +#define USERKEY_FIX XK_F +#define USERKEY_MOVE_LEFT XK_H +#define USERKEY_MOVE_DOWN XK_J +#define USERKEY_MOVE_UP XK_K +#define USERKEY_MOVE_RIGHT XK_L +#define USERKEY_MAXVERT XK_M +#define USERKEY_RAISE XK_R +#define USERKEY_TERMINAL XK_Return +#define USERKEY_MAX XK_X +#define USERKEY_CHANGE XK_Tab +#define USERKEY_BACKCHANGE XK_VoidSymbol +#define USERKEY_WS1 XK_1 +#define USERKEY_WS2 XK_2 +#define USERKEY_WS3 XK_3 +#define USERKEY_WS4 XK_4 +#define USERKEY_WS5 XK_5 +#define USERKEY_WS6 XK_6 +#define USERKEY_WS7 XK_7 +#define USERKEY_WS8 XK_8 +#define USERKEY_WS9 XK_9 +#define USERKEY_WS10 XK_0 +#define USERKEY_PREVWS XK_C +#define USERKEY_NEXTWS XK_V +#define USERKEY_TOPLEFT XK_Y +#define USERKEY_TOPRIGHT XK_U +#define USERKEY_BOTLEFT XK_B +#define USERKEY_BOTRIGHT XK_N +#define USERKEY_DELETE XK_End +#define USERKEY_PREVSCREEN XK_comma +#define USERKEY_NEXTSCREEN XK_period +#define USERKEY_ICONIFY XK_I diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template index 8e10e08d113..954d7745650 100644 --- a/srcpkgs/mcwm/template +++ b/srcpkgs/mcwm/template @@ -4,7 +4,7 @@ _distver=20130209 _patchver=2 wrksrc=${pkgname}-${_distver}-${_patchver} version=${_distver}.${_patchver} -revision=2 +revision=3 build_style=gnu-makefile makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel" short_desc="A minimalist stacking X window manager based on XCB" @@ -15,6 +15,7 @@ distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-${_distver}-${_patchver}.t checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be do_build() { + cp ${FILESDIR}/config.h config.h sed -i 's/man\/man1/share\/man\/man1/g' Makefile make CC=$CC ${makejobs} } @@ -23,6 +24,9 @@ do_install() { vmkdir usr/bin vmkdir usr/share/man/man1 make PREFIX=${DESTDIR}/usr install + vinstall scripts/9icon 755 usr/bin + vinstall scripts/mcicon 755 usr/bin + vinstall scripts/mcmenu 755 usr/bin vinstall LICENSE 644 usr/share/licenses/${pkgname} } From 41a646b964e6510dd36f166db0f56d707b782200 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Tue, 2 Jul 2013 21:40:27 +0200 Subject: [PATCH 02/22] mcwm-git: added config.h and needed scripts --- srcpkgs/mcwm-git/files/config.h | 98 +++++++++++++++++++++++++++++++++ srcpkgs/mcwm-git/template | 6 +- 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mcwm-git/files/config.h diff --git a/srcpkgs/mcwm-git/files/config.h b/srcpkgs/mcwm-git/files/config.h new file mode 100644 index 00000000000..0bfb3c3c765 --- /dev/null +++ b/srcpkgs/mcwm-git/files/config.h @@ -0,0 +1,98 @@ +/* User configurable stuff. */ + +/* + * Move this many pixels when moving or resizing with keyboard unless + * the window has hints saying otherwise. + */ +#define MOVE_STEP 32 + +/* + * Use this modifier combined with other keys to control wm from + * keyboard. Default is Mod4, which on my keyboard is the Alt key but + * is usually the Windows key on more normal keyboard layouts. + */ +#define MODKEY XCB_MOD_MASK_4 + +/* Extra modifier for resizing. Default is Shift. */ +#define SHIFTMOD XCB_MOD_MASK_SHIFT + +/* + * Modifier key to use with mouse buttons. Default Mod1, Meta on my + * keyboard. + */ +#define MOUSEMODKEY XCB_MOD_MASK_1 + +/* + * Start this program when pressing MODKEY + USERKEY_TERMINAL. Needs + * to be in $PATH. + * + * Change to "xterm" if you're feeling conservative. + * + * Can be set from command line with "-t program". + */ +#define TERMINAL "urxvt" + +/* + * Do we allow windows to be iconified? Set to true if you want this + * behaviour to be default. Can also be set by calling mcwm with -i. + */ +#define ALLOWICONS false + +/* + * Start these programs when pressing MOUSEMODKEY and mouse buttons on + * root window. + */ +#define MOUSE1 "" +#define MOUSE2 "" +#define MOUSE3 "mcmenu" + +/* + * Default colour on border for focused windows. Can be set from + * command line with "-f colour". + */ +#define FOCUSCOL "chocolate1" + +/* Ditto for unfocused. Use "-u colour". */ +#define UNFOCUSCOL "grey40" + +/* Ditto for fixed windows. Use "-x colour". */ +#define FIXEDCOL "grey90" + +/* Default width of border window, in pixels. Used unless -b width. */ +#define BORDERWIDTH 1 + +/* + * Keysym codes for window operations. Look in X11/keysymdefs.h for + * actual symbols. Use XK_VoidSymbol to disable a function. + */ +#define USERKEY_FIX XK_F +#define USERKEY_MOVE_LEFT XK_H +#define USERKEY_MOVE_DOWN XK_J +#define USERKEY_MOVE_UP XK_K +#define USERKEY_MOVE_RIGHT XK_L +#define USERKEY_MAXVERT XK_M +#define USERKEY_RAISE XK_R +#define USERKEY_TERMINAL XK_Return +#define USERKEY_MAX XK_X +#define USERKEY_CHANGE XK_Tab +#define USERKEY_BACKCHANGE XK_VoidSymbol +#define USERKEY_WS1 XK_1 +#define USERKEY_WS2 XK_2 +#define USERKEY_WS3 XK_3 +#define USERKEY_WS4 XK_4 +#define USERKEY_WS5 XK_5 +#define USERKEY_WS6 XK_6 +#define USERKEY_WS7 XK_7 +#define USERKEY_WS8 XK_8 +#define USERKEY_WS9 XK_9 +#define USERKEY_WS10 XK_0 +#define USERKEY_PREVWS XK_C +#define USERKEY_NEXTWS XK_V +#define USERKEY_TOPLEFT XK_Y +#define USERKEY_TOPRIGHT XK_U +#define USERKEY_BOTLEFT XK_B +#define USERKEY_BOTRIGHT XK_N +#define USERKEY_DELETE XK_End +#define USERKEY_PREVSCREEN XK_comma +#define USERKEY_NEXTSCREEN XK_period +#define USERKEY_ICONIFY XK_I diff --git a/srcpkgs/mcwm-git/template b/srcpkgs/mcwm-git/template index dba0801a7a1..ed552f4cb9f 100644 --- a/srcpkgs/mcwm-git/template +++ b/srcpkgs/mcwm-git/template @@ -1,7 +1,7 @@ # Template file for 'mcwm-git' pkgname=mcwm-git version="$(date +%Y%m%d)" -revision=1 +revision=2 build_style=gnu-makefile makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel" short_desc="A minimalist stacking X window manager based on XCB" @@ -19,6 +19,7 @@ do_fetch() { } do_build() { + cp ${FILESDIR}/config.h config.h sed -i 's/man\/man1/share\/man\/man1/g' Makefile make CC=$CC ${makejobs} } @@ -27,6 +28,9 @@ do_install() { vmkdir usr/bin vmkdir usr/share/man/man1 make PREFIX=${DESTDIR}/usr install + vinstall scripts/9icon 755 usr/bin + vinstall scripts/mcicon 755 usr/bin + vinstall scripts/mcmenu 755 usr/bin vinstall LICENSE 644 usr/share/licenses/${pkgname} } From d293592e78e8405a53d253d1e2da65aa347bf9fe Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 01:29:17 +0200 Subject: [PATCH 03/22] libdrm: update to 2.4.46. --- srcpkgs/libdrm/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 03dbbca488e..9af82db7f7f 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,6 +1,6 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.45 +version=2.4.46 revision=1 patch_args="-Np1" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://dri.freedesktop.org/" license="MIT" distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" -checksum=3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208 +checksum=33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1 pre_configure() { autoreconf -fi @@ -24,6 +24,7 @@ libdrm-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" #vmove usr/share/man/man3 } } From bcc1d1a6aa11ba57cbde652f1b2cf28476324017 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 01:43:23 +0200 Subject: [PATCH 04/22] file-roller: update to 3.8.3. --- srcpkgs/file-roller/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 933beef7b65..67ffa5eefe5 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.8.2 +version=3.8.3 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=b251b146d7966d770c98546e2152dbc17785ef3b8cf460f692829d0ac1cbe79e +checksum=55caac832ed0bab89085fdf7a3c3fa1afaf8ae6fb05aeb2a872e42cb6c52894e file-roller_package() { depends="desktop-file-utils hicolor-icon-theme" From 5f209e1c1ae9334152114bc8c9f45d9ad0f8d354 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 01:49:06 +0200 Subject: [PATCH 05/22] gmime: update to 2.6.16. --- srcpkgs/gmime/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template index c41cde5b3b0..ea9802ed64c 100644 --- a/srcpkgs/gmime/template +++ b/srcpkgs/gmime/template @@ -1,6 +1,6 @@ # Template file for 'gmime' pkgname=gmime -version=2.6.15 +version=2.6.16 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-mono --enable-smime" @@ -10,17 +10,17 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org/" distfiles="${GNOME_SITE}/gmime/2.6/gmime-${version}.tar.xz" -checksum=b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a +checksum=1093c2c9b4644d53b9c2df30042b3c4c2e9141d3e65e299030d227485d95c8af gmime-devel_package() { - depends="glib-devel zlib-devel gmime-${version}_${revision}" - short_desc="${short_desc} - development files" + depends="libglib-devel zlib-devel gmime-${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gtk-doc } - } } gmime_package() { From c7e85eb96cf1c8c9bc6670a96b6de5fe8efb7462 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 01:58:21 +0200 Subject: [PATCH 06/22] os-prober: update to 1.58. --- srcpkgs/os-prober/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index cf617f1fdf8..c0d7b4850d4 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,13 +1,13 @@ # Template file for 'os-prober' pkgname=os-prober -version=1.57 +version=1.58 revision=1 short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" license="GPL-2" distfiles="${DEBIAN_SITE}/main/o/$pkgname/${pkgname}_$version.tar.gz" -checksum=d63c6cbb825a7e411aac5e4805edc6db2fbf77a59282b71c10bd29723b8d860c +checksum=db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93 do_build() { make ${makejobs} From dc85373bbbed3a28bc713860b4545ffb00c0f7ea Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 02:04:09 +0200 Subject: [PATCH 07/22] os-prober: also package /var. --- srcpkgs/os-prober/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index c0d7b4850d4..c8b45eda1b1 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,7 +1,7 @@ # Template file for 'os-prober' pkgname=os-prober version=1.58 -revision=1 +revision=2 short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" @@ -26,7 +26,7 @@ do_install() { vmkdir var/lib/os-prober vmkdir usr/lib/linux-boot-probes/mounted vmkdir var/lib/os-prober - touch ${DESTDIR}/var/lib/os-prober/.owned + touch ${DESTDIR}/var/lib/os-prober/mount/.owned vinstall os-prober 755 usr/bin vinstall linux-boot-prober 755 usr/bin @@ -46,6 +46,6 @@ do_install() { os-prober_package() { pkg_install() { - vmove usr + vmove all } } From 6b76f459970ab0fe1566d5a16d60dcbf4b45dbee Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 02:05:12 +0200 Subject: [PATCH 08/22] os-prober: create required dir. --- srcpkgs/os-prober/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index c8b45eda1b1..5ff4032fe79 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -25,7 +25,7 @@ do_install() { vmkdir usr/share/os-prober vmkdir var/lib/os-prober vmkdir usr/lib/linux-boot-probes/mounted - vmkdir var/lib/os-prober + vmkdir var/lib/os-prober/mount touch ${DESTDIR}/var/lib/os-prober/mount/.owned vinstall os-prober 755 usr/bin From de0cd9aff72cf3b47c85ac06f54295a6e7d0d75f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 02:16:00 +0200 Subject: [PATCH 09/22] os-prober: use make_dirs; misc tweaks. --- srcpkgs/os-prober/template | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 5ff4032fe79..7a1afcc4ab0 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,7 +1,7 @@ # Template file for 'os-prober' pkgname=os-prober version=1.58 -revision=2 +revision=4 short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" @@ -14,37 +14,21 @@ do_build() { } do_install() { - local ARCH - - case "${XBPS_MACHINE}" in - i[56]86|x86_64) ARCH=x86;; - esac - - vmkdir usr/lib/os-probes/init - vmkdir usr/lib/os-probes/mounted - vmkdir usr/share/os-prober - vmkdir var/lib/os-prober - vmkdir usr/lib/linux-boot-probes/mounted - vmkdir var/lib/os-prober/mount - touch ${DESTDIR}/var/lib/os-prober/mount/.owned - - vinstall os-prober 755 usr/bin vinstall linux-boot-prober 755 usr/bin + vinstall os-prober 755 usr/bin vinstall newns 755 usr/lib/os-prober - vinstall common.sh 644 usr/share/os-prober + vinstall common.sh 755 usr/share/os-prober - vcopy "linux-boot-probes/common/*" usr/lib/linux-boot-probes - vcopy "linux-boot-probes/mounted/common/*" \ - usr/lib/linux-boot-probes/mounted - vcopy "linux-boot-probes/mounted/${ARCH}/*" \ - usr/lib/linux-boot-probes/mounted - vcopy "os-probes/common/*" usr/lib/os-probes - vcopy "os-probes/init/common/*" usr/lib/os-probes/init - vcopy "os-probes/mounted/common/*" usr/lib/os-probes/mounted - vcopy "os-probes/mounted/${ARCH}/*" usr/lib/os-probes/mounted + for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do + vmkdir usr/lib/${dir} + install -m755 -t ${DESTDIR}/usr/lib/${dir} ${dir}/common/* + [ -d ${dir}/x86 ] && cp -r ${dir}/x86/* ${DESTDIR}/usr/lib/${dir} + done + vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted/20macosx } os-prober_package() { + make_dirs="/var/lib/os-prober root root 0755" pkg_install() { vmove all } From 9503e11e3452138f13809c2b89abeae7942e47ac Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 02:18:24 +0200 Subject: [PATCH 10/22] os-prober: fix make_dirs args order. --- srcpkgs/os-prober/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 7a1afcc4ab0..1c530134f8c 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,7 +1,7 @@ # Template file for 'os-prober' pkgname=os-prober version=1.58 -revision=4 +revision=5 short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" @@ -28,7 +28,7 @@ do_install() { } os-prober_package() { - make_dirs="/var/lib/os-prober root root 0755" + make_dirs="/var/lib/os-prober 0755 root root" pkg_install() { vmove all } From 7129ead5a9b49dd40c7981bdc28265694d38615b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 03:58:30 +0200 Subject: [PATCH 11/22] kdelibs: update to 4.10.5. --- srcpkgs/kdelibs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index bc0bce1a18d..2aac5396ccc 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -1,13 +1,13 @@ # Template file for 'kdelibs' pkgname=kdelibs -version=4.10.4 -revision=3 +version=4.10.5 +revision=1 short_desc="KDE core libraries" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=a1e570c76e8f31687510bb27de0b5af85c4a7b8b4145189f0e93217c2e4c4420 +checksum=b6d404950bbe21657bf6362b2dd624d2e3cd22f23c1e6e20fa1ce71c41faf2d1 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF -DKDE_DISTRIBUTION_TEXT=Void From d766d0e63127b057834eee7bbf6ecc231a3b3649 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 03:59:33 +0200 Subject: [PATCH 12/22] nepomuk-core: update to 4.10.5. --- srcpkgs/nepomuk-core/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nepomuk-core/template b/srcpkgs/nepomuk-core/template index 140e606167a..8279f86ac1e 100644 --- a/srcpkgs/nepomuk-core/template +++ b/srcpkgs/nepomuk-core/template @@ -1,13 +1,13 @@ # Template file for 'nepomuk-core' pkgname=nepomuk-core -version=4.10.4 -revision=3 +version=4.10.5 +revision=1 short_desc="Networked Environment for Personalized, Ontology-based Management of Unified Knowledge" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=63e3570fefa49ded6d27951bbd61b2baa01e750e9b1c595b645959ee7edc4e93 +checksum=ffe6c39cc6fae22618ef98ddb9e1f66f2482f6bc50193260886411f610e2f989 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc" @@ -26,7 +26,6 @@ nepomuk-core-devel_package() { } nepomuk-core_package() { - depends="redland-storage-virtuoso" pkg_install() { vmove all } From e66bb9788fe97ce7bdeebf2d33d7e3ccb574b99f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 04:16:57 +0200 Subject: [PATCH 13/22] Update KDE SC to 4.10.5 (WIP). --- srcpkgs/kactivities/template | 4 ++-- srcpkgs/kde-base-artwork/template | 4 ++-- srcpkgs/kde-baseapps/template | 4 ++-- srcpkgs/kde-runtime/template | 4 ++-- srcpkgs/kde-wallpapers/template | 4 ++-- srcpkgs/kde-workspace/template | 4 ++-- srcpkgs/kdeadmin/template | 4 ++-- srcpkgs/kdeartwork/template | 4 ++-- srcpkgs/kdenetwork/template | 6 +++--- srcpkgs/kdepim-runtime/template | 4 ++-- srcpkgs/kdepim/template | 4 ++-- srcpkgs/kdepimlibs/template | 4 ++-- srcpkgs/kdeplasma-addons/template | 4 ++-- srcpkgs/kdesdk/template | 22 ++++++++++++++++++++++ srcpkgs/kmix/template | 4 ++-- srcpkgs/konsole/template | 4 ++-- srcpkgs/libkexiv2/template | 4 ++-- srcpkgs/nepomuk-widgets/template | 4 ++-- srcpkgs/oxygen-icons/template | 4 ++-- 19 files changed, 59 insertions(+), 37 deletions(-) create mode 100644 srcpkgs/kdesdk/template diff --git a/srcpkgs/kactivities/template b/srcpkgs/kactivities/template index d666a709fce..b9753ba4589 100644 --- a/srcpkgs/kactivities/template +++ b/srcpkgs/kactivities/template @@ -1,13 +1,13 @@ # Template file for 'kactivities' pkgname=kactivities -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE API for using and interacting with the Activity Manager" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kactivities" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b4085220188100250fa612de0865c21d9a65544be5889076d14d85b63a46c31d +checksum=4fc0d2a2e216d5aaa438c5d3685f9cb1e09bcc76486ca3bfb84e6e06f860cb69 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kde-base-artwork/template b/srcpkgs/kde-base-artwork/template index b1d31b4cc9b..9d2ee0fc64e 100644 --- a/srcpkgs/kde-base-artwork/template +++ b/srcpkgs/kde-base-artwork/template @@ -1,6 +1,6 @@ # Template file for 'kde-base-artwork' pkgname=kde-base-artwork -version=4.10.4 +version=4.10.5 revision=1 build_style=cmake hostmakedepends="cmake automoc4 pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=7ae99c1b3d66ecd2d798ef531fdf92a3aa75f1f5a98b963789bb84bc70995d66 +checksum=3cf73686015d23783dfe582ea16cda55dd6eb64b777353d35b530d5e512c03c3 kde-base-artwork_package() { noarch=yes diff --git a/srcpkgs/kde-baseapps/template b/srcpkgs/kde-baseapps/template index 64e0abaa412..f6337ceb1bf 100644 --- a/srcpkgs/kde-baseapps/template +++ b/srcpkgs/kde-baseapps/template @@ -1,13 +1,13 @@ # Template file for 'kde-baseapps' pkgname=kde-baseapps -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE base applications" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=34c68dc9ee38744ce435a98b3f97f31e206ec7ebc9568aaa96de083e9116ea18 +checksum=ff89e9c3a6eea103a368200cf2aa2bcd5d5c2dad92683aff03d1253516e608b4 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kde-runtime/template b/srcpkgs/kde-runtime/template index 2fe5609928a..ca3285cb151 100644 --- a/srcpkgs/kde-runtime/template +++ b/srcpkgs/kde-runtime/template @@ -1,13 +1,13 @@ # Template file for 'kde-runtime' pkgname=kde-runtime -version=4.10.4 +version=4.10.5 revision=1 short_desc="Plugins and applications necessary for running KDE applications" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b614b1c3720755d7e9505f81874dcbb573736f5f9c9557c4346c3ca98686b218 +checksum=fd42c9f1de38ccbc176b73d13059fec9b1cd0b50d40191a0d2b065eca5065c35 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF DWITH_QNtrack=OFF" diff --git a/srcpkgs/kde-wallpapers/template b/srcpkgs/kde-wallpapers/template index 67ef89a311b..11700afe4d9 100644 --- a/srcpkgs/kde-wallpapers/template +++ b/srcpkgs/kde-wallpapers/template @@ -1,6 +1,6 @@ # Template file for 'kde-wallpapers' pkgname=kde-wallpapers -version=4.10.4 +version=4.10.5 revision=1 build_style=cmake hostmakedepends="cmake automoc4 pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=7a32f7643010e2109d86db7d893d817278b8e6ce40e4c7ee25aaa5467be8573f +checksum=fbbaaebe6f8b4d69f02f81b97fb95691728cda193a5ab13ecf08591b965626b5 kde-wallpapers_package() { noarch=yes diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index 7aef0bc86da..3cf47cdae14 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -1,13 +1,13 @@ # Template file for 'kde-workspace' pkgname=kde-workspace -version=4.10.4 +version=4.10.5 revision=1 short_desc="Provides the interface and basic tools for the KDE workspace" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=55b9c79829fbbe781653951eb0b94dcfbb21fa46102c0c15db40521c143f22d1 +checksum=a346420258f96475b47a7e3a78945fc38c10d4732b01d8fc371d11dcad56e875 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF -DWITH_Xmms=OFF -DWITH_Googlegadgets=OFF diff --git a/srcpkgs/kdeadmin/template b/srcpkgs/kdeadmin/template index e99f3a9c0c1..d0bafcb6f67 100644 --- a/srcpkgs/kdeadmin/template +++ b/srcpkgs/kdeadmin/template @@ -1,13 +1,13 @@ # Template file for 'kdeadmin' pkgname=kdeadmin -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE administration tools" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=7a068014aaffb1eb319007608b7220bf001ed78e1b7da1a488230dcc8ddebad4 +checksum=84c5ef20903eb8b2f1d0b760de49532c51f0cbd20aaaed219c5bd747c54fe4b9 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kdeartwork/template b/srcpkgs/kdeartwork/template index 577c000d563..80dd99c3fe7 100644 --- a/srcpkgs/kdeartwork/template +++ b/srcpkgs/kdeartwork/template @@ -1,13 +1,13 @@ # Template file for 'kdeartwork' pkgname=kdeartwork -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE artwork" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=09dc9c6d8f3099bb63b939826f7ba87dfce911bc45454a058d4ea2f5c1a9a5ab +checksum=c6c573a6e3cd00cd4c1055708d9661bffbbb9220ba97382c54f5d3a225b53dfc build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kdenetwork/template b/srcpkgs/kdenetwork/template index 10313af44a9..7b7624f8057 100644 --- a/srcpkgs/kdenetwork/template +++ b/srcpkgs/kdenetwork/template @@ -1,13 +1,13 @@ # Template file for 'kdenetwork' pkgname=kdenetwork -version=4.10.4 -revision=2 +version=4.10.5 +revision=1 short_desc="KDE network applications/libraries" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e681cd08ec512303b08fddb847f26b612c10dee51b6746b32be30c4bed71a9ba +checksum=d308c7f4f14e5ca91d69e661538e051335de389ca1eb9a74c1cd92ad40092ad3 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF -DWITH_Xmms=OFF -DWITH_LibMeanwhile=OFF diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template index e16eb188e4b..d55fe081225 100644 --- a/srcpkgs/kdepim-runtime/template +++ b/srcpkgs/kdepim-runtime/template @@ -1,13 +1,13 @@ # Template file for 'kdepim-runtime' pkgname=kdepim-runtime -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE PIM runtime applications/libraries" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kdepimlibs" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=99976fa9a6c2233cae08b944231ec386b634fa3d1b7af9b77f4d9e02a65f87b4 +checksum=83e6f9bfcb223d6b305105fa822d112a00c53160549b94e0390fb0c6f11f49dc build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kdepim/template b/srcpkgs/kdepim/template index 2b9680f7528..b7429946321 100644 --- a/srcpkgs/kdepim/template +++ b/srcpkgs/kdepim/template @@ -1,6 +1,6 @@ # Template file for 'kdepim' pkgname=kdepim -version=4.10.4 +version=4.10.5 revision=1 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kdepimlibs" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=ff73baaaefe64ee3f1d5adfc15c435aae4ad650bdfe03c07681b2f8b48b9356d +checksum=016f05cf28ed546199d4aec0683bb4022beb52cc1799162085337fb7b3fd4163 # XXX dblatex, prison hostmakedepends="cmake automoc4 pkg-config" diff --git a/srcpkgs/kdepimlibs/template b/srcpkgs/kdepimlibs/template index 4444c83e2c5..112ce96e7c0 100644 --- a/srcpkgs/kdepimlibs/template +++ b/srcpkgs/kdepimlibs/template @@ -1,13 +1,13 @@ # Template file for 'kdepimlibs' pkgname=kdepimlibs -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE PIM Libraries" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kdepimlibs" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=f82a8b1b6515744a55f00a4b6bfdd5c4d8c2da184bc9488c298904520f04e626 +checksum=b9600f2ae1c61d65252ac5046c348f18d586114be3ab54744b0f5925f2881e06 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template index 9354d915acd..83a7e7041c9 100644 --- a/srcpkgs/kdeplasma-addons/template +++ b/srcpkgs/kdeplasma-addons/template @@ -1,13 +1,13 @@ # Template file for 'kdeplasma-addons' pkgname=kdeplasma-addons -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE Plasma Add-ons" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=14a2fdac89085f07c4f647f545824d3766b9accde6b753e275677122c6723e00 +checksum=f76fac6b5c2c67c63efc9eea58b829f07f998405ab5e74f4a489b2475e5d4943 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/kdesdk/template b/srcpkgs/kdesdk/template new file mode 100644 index 00000000000..a4ccffb2ec2 --- /dev/null +++ b/srcpkgs/kdesdk/template @@ -0,0 +1,22 @@ +# Template file for 'kdesdk' +pkgname=kdesdk +version=4.10.4 +revision=1 +short_desc="KDE network applications/libraries" +maintainer="Juan RP " +license="GPL, LGPL, FDL" +homepage="http://www.kde.org" +distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" +checksum=5a28c3147c81bf74a3ff36704df9a946cd35c61f8c6c4bfa2cf0dddd9a7275af + +build_style=cmake + +hostmakedepends="cmake automoc4 pkg-config" +makedepends="openssl-devel qt-devel phonon-devel strigi-devel soprano-devel + gettext-devel soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}" + +kdesdk_package() { + pkg_install() { + vmove all + } +} diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template index ffbc43b7451..ce8a58728b4 100644 --- a/srcpkgs/kmix/template +++ b/srcpkgs/kmix/template @@ -1,13 +1,13 @@ # Template file for 'kmix' pkgname=kmix -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE's mixer application" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=47fa26839adb83e30a5eb96fa734d8793a1f004e1694d92dba23c8809f7fc7cc +checksum=5b7243d821774bfc376706ddf7145aa5f2edc4905d786d46ff7ae76681309a22 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template index 1eedad28b66..ee99c22515d 100644 --- a/srcpkgs/konsole/template +++ b/srcpkgs/konsole/template @@ -1,13 +1,13 @@ # Template file for 'konsole' pkgname=konsole -version=4.10.4 +version=4.10.5 revision=1 short_desc="KDE's Terminal Emulator" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=a46d78a3e0b5b24f68b26011f95735ced645918eedfcc1f5ef5c9bc318237b4f +checksum=5695cdb36f09d70e8f3195d555299378e02263b895b19345b5a9e0fbc9ae15ff long_desc=" As well as being a standalone program, it is also used by other KDE programs such as the Kate editor and KDevelop development environment to provide easy diff --git a/srcpkgs/libkexiv2/template b/srcpkgs/libkexiv2/template index a925bc96e6a..2b39807963b 100644 --- a/srcpkgs/libkexiv2/template +++ b/srcpkgs/libkexiv2/template @@ -1,6 +1,6 @@ # Template file for 'libkexiv2' pkgname=libkexiv2 -version=4.10.4 +version=4.10.5 revision=1 build_style=cmake hostmakedepends="cmake automoc4 pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=1de2d3bca2270d1c3a8faf296a408c72d5c095795f4bbf12b4cec78f062333f1 +checksum=fb1e9fc9208550b2ddc1f4b04832ed0c7608fc595024cfb3ce1760307e76cfa2 libkexiv2-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/nepomuk-widgets/template b/srcpkgs/nepomuk-widgets/template index ed989377dec..03010a00d11 100644 --- a/srcpkgs/nepomuk-widgets/template +++ b/srcpkgs/nepomuk-widgets/template @@ -1,13 +1,13 @@ # Template file for 'nepomuk-widgets' pkgname=nepomuk-widgets -version=4.10.4 +version=4.10.5 revision=1 short_desc="The Library containing the KDE Nepomuk Widgets" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=bc6b6098eb58422868c3f42fca9b895c226c892c2bb4e089d8bd22a7e10b950b +checksum=d09323a0d0a8e086044c39d9565edbacb082f4f53b24a112339115b8c3e6f5da build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc" diff --git a/srcpkgs/oxygen-icons/template b/srcpkgs/oxygen-icons/template index 8c6446a7755..39a0a4270b6 100644 --- a/srcpkgs/oxygen-icons/template +++ b/srcpkgs/oxygen-icons/template @@ -1,6 +1,6 @@ # Template file for 'oxygen-icons' pkgname=oxygen-icons -version=4.10.4 +version=4.10.5 revision=1 build_style=cmake hostmakedepends="cmake automoc4" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.${pkgname}.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b76e00739f0143c9b48aeb842e810a423f7bb8ac20d144c806fac56909b98d67 +checksum=cae327568f5382eebc3257326776fb4a2b0ab5cdd7b78e9cacd347efcec1f1f8 long_desc=" Oxygen is the standard icon theme for KDE 4, but follows the freedesktop.org icon schemes, so it can be used in other desktop environments using this From 4ecfd875081e711a66ef25be5984c5b373b6a1f4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 04:18:15 +0200 Subject: [PATCH 14/22] kdesdk: update to 4.10.5 (WIP). --- srcpkgs/kdesdk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdesdk/template b/srcpkgs/kdesdk/template index a4ccffb2ec2..18b3874ef9d 100644 --- a/srcpkgs/kdesdk/template +++ b/srcpkgs/kdesdk/template @@ -1,13 +1,13 @@ # Template file for 'kdesdk' pkgname=kdesdk -version=4.10.4 +version=4.10.5 revision=1 -short_desc="KDE network applications/libraries" +short_desc="KDE SDK" maintainer="Juan RP " license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5a28c3147c81bf74a3ff36704df9a946cd35c61f8c6c4bfa2cf0dddd9a7275af +checksum=e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140 build_style=cmake From 2d42af96877d25544000661236ab24f16817028d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 09:24:44 +0200 Subject: [PATCH 15/22] New package: kde-4.10.5 (meta-pkg for kde, WIP). --- srcpkgs/kde/template | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 srcpkgs/kde/template diff --git a/srcpkgs/kde/template b/srcpkgs/kde/template new file mode 100644 index 00000000000..18cde672adc --- /dev/null +++ b/srcpkgs/kde/template @@ -0,0 +1,27 @@ +# Template file for 'kde' +pkgname=kde +version=4.10.5 +revision=1 +build_style=meta-template +makedepends=" + kdeadmin>=${version} + kde-baseapps>=${version} + kde-runtime>=${version} + kde-workspace>=${version} + kdeartwork>=${version} + kdenetwork>=${version} + kdepim>=${version} + kdepim-runtime>=${version} + kdeplasma-addons>=${version} + kmix>=${version} + konsole>=${version} + oxygen-icons>=${version}" +short_desc="The KDE meta-package for Void Linux" +maintainer="Juan RP " +homepage="http://www.kde.org" +license="GPL, LGPL, FDL" + +kde_package() { + noarch="yes" + depends="${makedepends}" +} From 72db045b0b745f0fd775aaa23ce7655669e0ddf5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 09:34:23 +0200 Subject: [PATCH 16/22] kde: added polkit-kde. --- srcpkgs/kde/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/kde/template b/srcpkgs/kde/template index 18cde672adc..3345a2d911f 100644 --- a/srcpkgs/kde/template +++ b/srcpkgs/kde/template @@ -15,7 +15,8 @@ makedepends=" kdeplasma-addons>=${version} kmix>=${version} konsole>=${version} - oxygen-icons>=${version}" + oxygen-icons>=${version} + polkit-kde" short_desc="The KDE meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.kde.org" From bbde6f7f6e348d8cca8503b6b3b1a08f45e4a97e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 13:40:08 +0200 Subject: [PATCH 17/22] libXi: update to 1.7.2. --- srcpkgs/libXi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template index 33e000fd99b..7e0746a4d8d 100644 --- a/srcpkgs/libXi/template +++ b/srcpkgs/libXi/template @@ -1,6 +1,6 @@ # Template build file for 'libXi'. pkgname=libXi -version=1.7.1.901 +version=1.7.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config xmlto" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="${XORG_SITE}" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=5248b643fc0b76fff978eefc0acdeee278407983cf7b6e371242e1b53ba32f7c +checksum=df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e libXi-devel_package() { depends="inputproto libX11-devel libXext-devel libXfixes-devel libXi>=${version}" From 22e0fa8f8e87a6f2b7d2c5ae29d08d596d85d5c6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 15:31:21 +0200 Subject: [PATCH 18/22] New package: allegro4-4.4.2. --- common/shlibs | 1 + srcpkgs/allegro4-devel | 1 + srcpkgs/allegro4/template | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 120000 srcpkgs/allegro4-devel create mode 100644 srcpkgs/allegro4/template diff --git a/common/shlibs b/common/shlibs index 0746a28a58c..566b3f3adb3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1361,3 +1361,4 @@ libvncserver.so.0 libvncserver-0.9.9_1 libvncclient.so.0 libvncserver-0.9.9_1 libotr3.so.2 libotr3-3.2.1_1 libotr.so.5 libotr-4.0.0_1 +liballeg.so.4 allegro4-4.4.2_1 diff --git a/srcpkgs/allegro4-devel b/srcpkgs/allegro4-devel new file mode 120000 index 00000000000..78e32384bf6 --- /dev/null +++ b/srcpkgs/allegro4-devel @@ -0,0 +1 @@ +allegro4 \ No newline at end of file diff --git a/srcpkgs/allegro4/template b/srcpkgs/allegro4/template new file mode 100644 index 00000000000..3fb4a67a310 --- /dev/null +++ b/srcpkgs/allegro4/template @@ -0,0 +1,34 @@ +# Template file for 'allegro4'. +pkgname=allegro4 +version=4.4.2 +revision=1 +wrksrc="allegro-${version}" +build_style=cmake +configure_args="-DWANT_DOCS=OFF" +hostmakedepends="pkg-config cmake" +makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel + libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel" +short_desc="Portable library mainly aimed at video game and multimedia programming" +maintainer="Juan RP " +license="Allegro License (MIT alike)" +homepage="http://alleg.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/alleg/allegro-$version.tar.gz" +checksum=1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc + +allegro4-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/bin/allegro-config + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} + +allegro4_package() { + # libGL.so is dlopen()ed. + depends="libGL" + pkg_install() { + vmove usr + } +} From 01854ba64bc253891e40a0456f1eb7cfd76e786a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 15:46:36 +0200 Subject: [PATCH 19/22] New package: opensonic-0.1.4. --- common/shlibs | 2 +- srcpkgs/opensonic/files/opensonic.desktop | 9 ++++++ srcpkgs/opensonic/files/opensonic.sh | 3 ++ srcpkgs/opensonic/template | 36 +++++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/opensonic/files/opensonic.desktop create mode 100644 srcpkgs/opensonic/files/opensonic.sh create mode 100644 srcpkgs/opensonic/template diff --git a/common/shlibs b/common/shlibs index 566b3f3adb3..37a2b455e2c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1361,4 +1361,4 @@ libvncserver.so.0 libvncserver-0.9.9_1 libvncclient.so.0 libvncserver-0.9.9_1 libotr3.so.2 libotr3-3.2.1_1 libotr.so.5 libotr-4.0.0_1 -liballeg.so.4 allegro4-4.4.2_1 +liballeg.so.4.4 allegro4-4.4.2_1 diff --git a/srcpkgs/opensonic/files/opensonic.desktop b/srcpkgs/opensonic/files/opensonic.desktop new file mode 100644 index 00000000000..372278fb566 --- /dev/null +++ b/srcpkgs/opensonic/files/opensonic.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=Opensonic +GenericName=Opensonic +Comment=Game based on the "Sonic the Hedgehog" universe. +Exec=/usr/bin/opensonic +Categories=Game;ArcadeGame; +Icon=/usr/share/opensonic/icon.png diff --git a/srcpkgs/opensonic/files/opensonic.sh b/srcpkgs/opensonic/files/opensonic.sh new file mode 100644 index 00000000000..68b19131f78 --- /dev/null +++ b/srcpkgs/opensonic/files/opensonic.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +exec /usr/share/opensonic/opensonic diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template new file mode 100644 index 00000000000..a3b320a8970 --- /dev/null +++ b/srcpkgs/opensonic/template @@ -0,0 +1,36 @@ +# Template file for 'opensonic' +pkgname=opensonic +version=0.1.4 +revision=1 +hostmakedepends="cmake" +makedepends="allegro4-devel libpng-devel libvorbis-devel desktop-file-utils" +wrksrc="opensnc-src-${version}" +short_desc="Open-source game based on the Sonic the Hedgehog universe" +maintainer="Juan RP " +license="GPL-2" +homepage="http://opensnc.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/opensnc-src-${version}.tar.gz" +checksum=3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9 + +do_configure() { + unset LDFLAGS + ./configure --prefix=/usr +} + +do_build() { + make ${makejobs} +} + +do_install() { + make DESTDIR=${DESTDIR} install + vinstall icon.png 644 usr/share/${pkgname} + vinstall ${FILESDIR}/opensonic.sh 755 usr/bin + vinstall ${FILESDIR}/opensonic.desktop 644 usr/share/applications +} + +opensonic_package() { + depends="desktop-file-utils" + pkg_install() { + vmove all + } +} From 4ab5a580ac47ab5d5f71044d3ba95bdd61d6bd2d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 15:58:41 +0200 Subject: [PATCH 20/22] opensonic: install shell script just as opensonic. --- srcpkgs/opensonic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template index a3b320a8970..c256d4c030d 100644 --- a/srcpkgs/opensonic/template +++ b/srcpkgs/opensonic/template @@ -1,7 +1,7 @@ # Template file for 'opensonic' pkgname=opensonic version=0.1.4 -revision=1 +revision=2 hostmakedepends="cmake" makedepends="allegro4-devel libpng-devel libvorbis-devel desktop-file-utils" wrksrc="opensnc-src-${version}" @@ -24,7 +24,7 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install vinstall icon.png 644 usr/share/${pkgname} - vinstall ${FILESDIR}/opensonic.sh 755 usr/bin + vinstall ${FILESDIR}/opensonic.sh 755 usr/bin opensonic vinstall ${FILESDIR}/opensonic.desktop 644 usr/share/applications } From 179f69ea0e7165d32b2272ac79dbc0e76542ee85 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 16:17:18 +0200 Subject: [PATCH 21/22] New package: fsarchiver-0.6.17. --- srcpkgs/fsarchiver/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/fsarchiver/template diff --git a/srcpkgs/fsarchiver/template b/srcpkgs/fsarchiver/template new file mode 100644 index 00000000000..21000408fe4 --- /dev/null +++ b/srcpkgs/fsarchiver/template @@ -0,0 +1,20 @@ +# Template file for 'fsarchiver' +pkgname=fsarchiver +version=0.6.17 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="zlib-devel bzip2-devel lzo-devel liblzma-devel libgcrypt-devel + e2fsprogs-devel libuuid-devel attr-devel" +short_desc="Safe and flexible file-system backup and deployment tool" +maintainer="Juan RP " +license="GPL-2" +homepage="http://www.fsarchiver.org/" +distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" +checksum=409add97337783cb135f15c07318acf5067f5837f07bd62c7e358f3dcf5dced5 + +fsarchiver_package() { + pkg_install() { + vmove usr + } +} From 901be86cb02e2677adc3ee3ca7b6dab40ccff618 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jul 2013 17:38:53 +0200 Subject: [PATCH 22/22] New package: reminiscence-0.2.1. --- srcpkgs/reminiscence/patches/fix-keys.diff | 29 ++++++++++++++++++++++ srcpkgs/reminiscence/template | 28 +++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 srcpkgs/reminiscence/patches/fix-keys.diff create mode 100644 srcpkgs/reminiscence/template diff --git a/srcpkgs/reminiscence/patches/fix-keys.diff b/srcpkgs/reminiscence/patches/fix-keys.diff new file mode 100644 index 00000000000..567c22d9902 --- /dev/null +++ b/srcpkgs/reminiscence/patches/fix-keys.diff @@ -0,0 +1,29 @@ +--- systemstub_sdl.cpp ++++ systemstub_sdl.cpp +@@ -403,12 +403,12 @@ while (true) { + if (ev.key.keysym.mod & KMOD_ALT) { + if (ev.key.keysym.sym == SDLK_RETURN) { + switchGfxMode(!_fullscreen, _currentScaler); +- } else if (ev.key.keysym.sym == SDLK_KP_PLUS) { ++ } else if (ev.key.keysym.sym == SDLK_PLUS) { + uint8 s = _currentScaler + 1; + if (s < NUM_SCALERS) { + switchGfxMode(_fullscreen, s); + } +- } else if (ev.key.keysym.sym == SDLK_KP_MINUS) { ++ } else if (ev.key.keysym.sym == SDLK_MINUS) { + int8 s = _currentScaler - 1; + if (_currentScaler > 0) { + switchGfxMode(_fullscreen, s); +@@ -429,9 +429,9 @@ while (true) { + _pi.save = true; + } else if (ev.key.keysym.sym == SDLK_l) { + _pi.load = true; +- } else if (ev.key.keysym.sym == SDLK_KP_PLUS) { ++ } else if (ev.key.keysym.sym == SDLK_PLUS) { + _pi.stateSlot = 1; +- } else if (ev.key.keysym.sym == SDLK_KP_MINUS) { ++ } else if (ev.key.keysym.sym == SDLK_MINUS) { + _pi.stateSlot = -1; + } else if (ev.key.keysym.sym == SDLK_r) { + _pi.inpRecord = true; diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template new file mode 100644 index 00000000000..cd9139f007c --- /dev/null +++ b/srcpkgs/reminiscence/template @@ -0,0 +1,28 @@ +# Template file for 'reminiscince' +pkgname=reminiscence +version=0.2.1 +revision=1 +wrksrc="REminiscence-${version}" +build_style=gnu-makefile +makedepends="SDL-devel zlib-devel" +short_desc="Rewrite of the engine used in the game Flashback from Delphine Software" +maintainer="Juan RP " +license="GPL-3" +homepage="http://cyxdown.free.fr/reminiscence/" +distfiles="http://cyxdown.free.fr/reminiscence/REminiscence-${version}.tar.bz2" +checksum=3168ffb7cd29e72a150e22edc6f0891001288f4c89d7900cbac8864ce763c2bd + +do_build() { + make CXX=$CXX ${makejobs} +} + +do_install() { + vinstall rs 755 usr/bin + vinstall README 644 usr/share/doc/${pkgname} +} + +reminiscence_package() { + pkg_install() { + vmove usr + } +}