From 7b6d778f6043e54e21bb05a9b8c86a97e1645422 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 27 Jun 2014 11:01:11 +0200 Subject: [PATCH] New package: python-notify-0.1.1 (python2-only), replaces notify-python Fix cross build. Revbump affected pkgs. --- srcpkgs/hamster-applet/template | 6 ++--- srcpkgs/notify-python/template | 17 ------------- .../patches/libnotify07.patch | 0 .../notify-python-0.1.1-fix-GTK-symbols.patch | 0 srcpkgs/python-notify/template | 25 +++++++++++++++++++ srcpkgs/system-config-printer/template | 6 ++--- srcpkgs/wicd/template | 5 ++-- 7 files changed, 34 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/notify-python/template rename srcpkgs/{notify-python => python-notify}/patches/libnotify07.patch (100%) rename srcpkgs/{notify-python => python-notify}/patches/notify-python-0.1.1-fix-GTK-symbols.patch (100%) create mode 100644 srcpkgs/python-notify/template diff --git a/srcpkgs/hamster-applet/template b/srcpkgs/hamster-applet/template index f9b0929b51..bfc896fdfc 100644 --- a/srcpkgs/hamster-applet/template +++ b/srcpkgs/hamster-applet/template @@ -1,13 +1,13 @@ # Template file for 'hamster-applet' pkgname=hamster-applet version=2.91.2 -revision=7 +revision=8 noarch=yes build_style=waf hostmakedepends="pkg-config intltool gnome-doc-utils docbook2x" makedepends="python-devel glib-devel dbus-glib-devel gnome-control-center-devel - notify-python python-dbus python-sqlite python-xdg" -depends="python-dbus notify-python pygtk python-xdg python-gconf python-sqlite" + python-notify python-dbus python-sqlite python-xdg" +depends="python-dbus python-notify pygtk python-xdg python-gconf python-sqlite" pycompile_module="hamster" short_desc="Time tracking application for individuals" maintainer="Juan RP " diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template deleted file mode 100644 index f96daeaa98..0000000000 --- a/srcpkgs/notify-python/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'notify-python' -pkgname=notify-python -version=0.1.1 -revision=10 -lib32disabled=yes -patch_args="-Np1" -build_style=gnu-configure -hostmakedepends="pkg-config python-devel" -makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel" -depends="pygtk" -pycompile_module="gtk-2.0/pynotify" -short_desc="Python bindings for libnotify" -homepage="http://www.galago-project.org/" -license="LGPL-2.1" -maintainer="Juan RP " -distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz" -checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022 diff --git a/srcpkgs/notify-python/patches/libnotify07.patch b/srcpkgs/python-notify/patches/libnotify07.patch similarity index 100% rename from srcpkgs/notify-python/patches/libnotify07.patch rename to srcpkgs/python-notify/patches/libnotify07.patch diff --git a/srcpkgs/notify-python/patches/notify-python-0.1.1-fix-GTK-symbols.patch b/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch similarity index 100% rename from srcpkgs/notify-python/patches/notify-python-0.1.1-fix-GTK-symbols.patch rename to srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch diff --git a/srcpkgs/python-notify/template b/srcpkgs/python-notify/template new file mode 100644 index 0000000000..c8486cab32 --- /dev/null +++ b/srcpkgs/python-notify/template @@ -0,0 +1,25 @@ +# Template file for 'python-notify' +pkgname=python-notify +version=0.1.1 +revision=11 +lib32disabled=yes +patch_args="-Np1" +wrksrc="notify-python-${version}" +build_style=gnu-configure +hostmakedepends="pkg-config python-devel python-gobject2-devel pygtk-devel" +makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel" +depends="pygtk" +replaces="notify-python>=0" +pycompile_module="gtk-2.0/pynotify" +short_desc="Python2 bindings for libnotify" +homepage="http://www.galago-project.org/" +license="LGPL-2.1" +maintainer="Juan RP " +distfiles="http://www.galago-project.org/files/releases/source/notify-python/notify-python-${version}.tar.gz" +checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022 + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure + fi +} diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template index 43923b1c13..00b1ab39f2 100644 --- a/srcpkgs/system-config-printer/template +++ b/srcpkgs/system-config-printer/template @@ -1,16 +1,16 @@ # Template file for 'system-config-printer' pkgname=system-config-printer version=1.4.4 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-udev-rules" make_build_args="udevhelperdir=/usr/lib/udev" make_install_args="udevhelperdir=/usr/lib/udev udevrulesdir=/usr/lib/udev/rules.d" hostmakedepends="pkg-config intltool xmlto desktop-file-utils" makedepends="gtk+3-devel cups-devel libusb-devel systemd-devel - python-cups python-dbus notify-python python-curl python-smbc python-gobject + python-cups python-dbus python-notify python-curl python-smbc python-gobject gir-freedesktop gnome-keyring" -depends="python python-cups python-dbus notify-python python-curl python-smbc +depends="python python-cups python-dbus python-notify python-curl python-smbc python-gobject gir-freedesktop gnome-keyring" pycompile_module="cupshelpers" pycompile_dirs="/usr/share/system-config-printer" diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index b7918a835e..2ebed28474 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,7 +1,7 @@ # Template file for 'wicd' pkgname=wicd version=1.7.2.4 -revision=6 +revision=7 noarch=yes hostmakedepends="python python-setuptools python-babel" makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib python-dbus @@ -47,7 +47,8 @@ do_install() { wicd-gtk_package() { noarch=yes - depends="wicd>=${version} pygtk notify-python shared-mime-info desktop-file-utils hicolor-icon-theme" + depends="${sourcepkg}>=${version} pygtk python-notify shared-mime-info + desktop-file-utils hicolor-icon-theme" short_desc+=" - GTK UI" pycompile_dirs="usr/share/wicd/gtk" pkg_install() {