From 344942ecbf7b164f7a637d383b18a963fbd0983b Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Wed, 5 Nov 2014 12:32:12 -0800 Subject: [PATCH 1/7] New package: libkeybinder2-0.3.0 --- common/shlibs | 2 ++ srcpkgs/libkeybinder2-devel | 1 + srcpkgs/libkeybinder2/template | 51 ++++++++++++++++++++++++++++++++++ srcpkgs/python-keybinder2 | 1 + 4 files changed, 55 insertions(+) create mode 120000 srcpkgs/libkeybinder2-devel create mode 100644 srcpkgs/libkeybinder2/template create mode 120000 srcpkgs/python-keybinder2 diff --git a/common/shlibs b/common/shlibs index 4a2638347d..5a7c627ca6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -918,6 +918,8 @@ libnilfscleaner.so.0 libnilfs-2.1.0_1 libchicken.so.7 libchicken-4.9.0_1 libmdb.so.0 libmdb-0.5_1 libmdbsql.so.0 libmdb-0.5_1 +libkeybinder.so libkeybinder2-0.3.0_1 +libkeybinder.so.0 libkeybinder2-0.3.0_1 libkmod.so.2 libkmod-5_1 libestr.so.0 libestr-0.1.2_1 libee.so.0 libee-0.3.2_1 diff --git a/srcpkgs/libkeybinder2-devel b/srcpkgs/libkeybinder2-devel new file mode 120000 index 0000000000..d6223465b4 --- /dev/null +++ b/srcpkgs/libkeybinder2-devel @@ -0,0 +1 @@ +libkeybinder2 \ No newline at end of file diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template new file mode 100644 index 0000000000..d650174de3 --- /dev/null +++ b/srcpkgs/libkeybinder2/template @@ -0,0 +1,51 @@ +pkgname=libkeybinder2 +_offname=keybinder +version=0.3.0 +revision=1 +build_style=gnu-configure +configuer_args="$(vopt_enable gir introspection)" +hostmakedepends="automake libtool pkg-config intltool gnome-common" +makedepends="pygtk-devel gtk+-devel $(vopt_if gir gobject-introspection)" +short_desc="Library for registering global keyboard shortcuts (GTK+2)" +maintainer="ShadowKyogre " +homepage="http://www.gnome.org/" +license="GPL-2" +distfiles="https://github.com/engla/${_offname}/archive/v${version}.tar.gz" +checksum=8e8d77386b9e29556fab097c31aec643d36a33d201733b7b999179abcba7774e +wrksrc=${_offname}-${version} + +# Disable gir for cross builds. +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi + +pre_configure() { + ./autogen.sh +} + + +libkeybinder2-devel_package() +{ + depends="pygtk-devel gtk+-devel ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() + { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + #vmove usr/share/gtk-doc + #if [ "$build_option_gir" ]; then + # vmove usr/share/gir-1.0 + #fi + } +} + +python-keybinder2_package() +{ + depends="pygtk" + short_desc+=" - python module" + pkg_install() + { + vmove usr/lib/python2.7 + } +} diff --git a/srcpkgs/python-keybinder2 b/srcpkgs/python-keybinder2 new file mode 120000 index 0000000000..d6223465b4 --- /dev/null +++ b/srcpkgs/python-keybinder2 @@ -0,0 +1 @@ +libkeybinder2 \ No newline at end of file From ee18e4ecc89afedb8908b25caf37b88a506cb890 Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Wed, 5 Nov 2014 12:36:06 -0800 Subject: [PATCH 2/7] kupfer: Apply settings validation patch and add python-keybinder2 dependency --- srcpkgs/kupfer/patches/settings.patch | 23 +++++++++++++++++++++++ srcpkgs/kupfer/template | 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/kupfer/patches/settings.patch diff --git a/srcpkgs/kupfer/patches/settings.patch b/srcpkgs/kupfer/patches/settings.patch new file mode 100644 index 0000000000..7c38e7fb9a --- /dev/null +++ b/srcpkgs/kupfer/patches/settings.patch @@ -0,0 +1,23 @@ +diff -aur kupfer-v208/kupfer/core/settings.py +kupfer-v208.modified/kupfer/core/settings.py +--- kupfer-v208/kupfer/core/settings.py 2012-06-01 10:51:14.000000000 -0700 ++++ kupfer-v208.modified/kupfer/core/settings.py 2012-11-21 14:48:11.876592441 +-0800 +@@ -393,6 +393,8 @@ + """ + Get a list of (id_, name) tuples for the given @category_key + """ ++ if not category_key in self._alternative_validators: ++ return + validator = self._alternative_validators[category_key] + for (id_, alternative) in self._alternatives[category_key].iteritems(): + name = alternative["name"] +@@ -400,7 +402,8 @@ + yield (id_, name) + + def get_all_alternatives(self, category_key): +- return self._alternatives[category_key] ++ if category_key in self._alternatives: ++ return self._alternatives[category_key] + + def get_preferred_alternative(self, category_key): diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template index 52af1c74b8..ff91e1ee12 100644 --- a/srcpkgs/kupfer/template +++ b/srcpkgs/kupfer/template @@ -1,10 +1,11 @@ # Template file for 'kupfer' pkgname=kupfer version=208 -revision=2 +revision=3 +patch_args="-Np1" build_style=waf hostmakedepends="perl intltool" -makedepends="python python-gobject2 pygtk python-xdg python-dbus" +makedepends="python python-gobject2 pygtk python-xdg python-dbus python-keybinder2" depends="$makedepends" short_desc="Interface for quick and convenient access to applications" maintainer="Enno Boland " From dcfcd6e548f6535616a72a15af82ed4a12699f40 Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Wed, 5 Nov 2014 13:02:01 -0800 Subject: [PATCH 3/7] libkeybinder2: Fix typo in configure_args, remove gtk+-devel (redundant dependency), and don't forget to link the proper homepage. --- srcpkgs/libkeybinder2/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template index d650174de3..db7ce42afd 100644 --- a/srcpkgs/libkeybinder2/template +++ b/srcpkgs/libkeybinder2/template @@ -3,12 +3,13 @@ _offname=keybinder version=0.3.0 revision=1 build_style=gnu-configure -configuer_args="$(vopt_enable gir introspection)" +build_options="gir" +configure_args="$(vopt_enable gir introspection)" hostmakedepends="automake libtool pkg-config intltool gnome-common" -makedepends="pygtk-devel gtk+-devel $(vopt_if gir gobject-introspection)" +makedepends="pygtk-devel $(vopt_if gir gobject-introspection)" short_desc="Library for registering global keyboard shortcuts (GTK+2)" maintainer="ShadowKyogre " -homepage="http://www.gnome.org/" +homepage="https://github.com/engla/keybinder" license="GPL-2" distfiles="https://github.com/engla/${_offname}/archive/v${version}.tar.gz" checksum=8e8d77386b9e29556fab097c31aec643d36a33d201733b7b999179abcba7774e From ab0dc72dff0bf4496bee2cfb2a1d435d5cee6c87 Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Wed, 5 Nov 2014 13:04:32 -0800 Subject: [PATCH 4/7] libkeybinder2: Also remove redundant gtk+-devel dependency for the -devel subpackage --- srcpkgs/libkeybinder2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template index db7ce42afd..ada104d7f3 100644 --- a/srcpkgs/libkeybinder2/template +++ b/srcpkgs/libkeybinder2/template @@ -27,7 +27,7 @@ pre_configure() { libkeybinder2-devel_package() { - depends="pygtk-devel gtk+-devel ${sourcepkg}-${version}_${revision}" + depends="pygtk-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { From e206a52fd489bd7b9f955e0da112d60397224741 Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Thu, 6 Nov 2014 08:45:24 -0800 Subject: [PATCH 5/7] libkeybinder2: Remove _offname that was used just in the distfiles and wrksrc variable. Also, include gtk-doc in hostmakedepends and force the source file to be written to a properly named *.tar.gz. --- srcpkgs/libkeybinder2/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template index ada104d7f3..ed8ff50294 100644 --- a/srcpkgs/libkeybinder2/template +++ b/srcpkgs/libkeybinder2/template @@ -1,19 +1,18 @@ pkgname=libkeybinder2 -_offname=keybinder version=0.3.0 revision=1 build_style=gnu-configure build_options="gir" configure_args="$(vopt_enable gir introspection)" -hostmakedepends="automake libtool pkg-config intltool gnome-common" +hostmakedepends="automake libtool pkg-config intltool gnome-common gtk-doc" makedepends="pygtk-devel $(vopt_if gir gobject-introspection)" short_desc="Library for registering global keyboard shortcuts (GTK+2)" maintainer="ShadowKyogre " homepage="https://github.com/engla/keybinder" license="GPL-2" -distfiles="https://github.com/engla/${_offname}/archive/v${version}.tar.gz" +distfiles="https://github.com/engla/keybinder/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=8e8d77386b9e29556fab097c31aec643d36a33d201733b7b999179abcba7774e -wrksrc=${_offname}-${version} +wrksrc=keybinder-${version} # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then From 6629e99b8ba17115d7e2f5d02854fbe0580ce808 Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Thu, 6 Nov 2014 08:55:07 -0800 Subject: [PATCH 6/7] libkeybinder2: Remove blank lines, uncomment the check for gir when packaging the -devel subpackage, and remove commented out vmove for usr/share/gtk-doc. --- srcpkgs/libkeybinder2/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template index ed8ff50294..3a6f86307a 100644 --- a/srcpkgs/libkeybinder2/template +++ b/srcpkgs/libkeybinder2/template @@ -23,7 +23,6 @@ pre_configure() { ./autogen.sh } - libkeybinder2-devel_package() { depends="pygtk-devel ${sourcepkg}-${version}_${revision}" @@ -33,10 +32,9 @@ libkeybinder2-devel_package() vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - #vmove usr/share/gtk-doc - #if [ "$build_option_gir" ]; then - # vmove usr/share/gir-1.0 - #fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi } } From 61a47d352172e4434441f022b4e7d0f4d4ac280d Mon Sep 17 00:00:00 2001 From: ShadowKyogre Date: Thu, 6 Nov 2014 09:00:59 -0800 Subject: [PATCH 7/7] libkeybinder2: Likewise, remove the renaming of distfile --- srcpkgs/libkeybinder2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template index 3a6f86307a..2c9413b63f 100644 --- a/srcpkgs/libkeybinder2/template +++ b/srcpkgs/libkeybinder2/template @@ -10,7 +10,7 @@ short_desc="Library for registering global keyboard shortcuts (GTK+2)" maintainer="ShadowKyogre " homepage="https://github.com/engla/keybinder" license="GPL-2" -distfiles="https://github.com/engla/keybinder/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +distfiles="https://github.com/engla/keybinder/archive/v${version}.tar.gz" checksum=8e8d77386b9e29556fab097c31aec643d36a33d201733b7b999179abcba7774e wrksrc=keybinder-${version}