[arch-commits] Commit in nitrogen/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Monday, August 18, 2014 @ 10:58:44
  Author: bpiotrowski
Revision: 220198

upgpkg: nitrogen 1.5.2-2

mtree rebuild

Added:
  nitrogen/trunk/nitrogen-1.5.2-X11-linker-flags.patch
Modified:
  nitrogen/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   14 +++++++++++---
 nitrogen-1.5.2-X11-linker-flags.patch |   18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-18 08:53:34 UTC (rev 220197)
+++ PKGBUILD	2014-08-18 08:58:44 UTC (rev 220198)
@@ -5,7 +5,7 @@
 
 pkgname=nitrogen
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Background browser and setter for X windows"
 arch=('i686' 'x86_64')
 url="http://projects.l3ib.org/nitrogen/"
@@ -12,9 +12,17 @@
 license=('GPL')
 depends=('gtkmm' 'hicolor-icon-theme' 'librsvg')
 install=nitrogen.install
-source=(http://projects.l3ib.org/nitrogen/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('dd779a252a222eb9d329d74b809cfe73')
+source=(http://projects.l3ib.org/nitrogen/files/${pkgname}-${pkgver}.tar.gz
+        nitrogen-1.5.2-X11-linker-flags.patch)
+md5sums=('dd779a252a222eb9d329d74b809cfe73'
+         'db7e39130431c12aece2f32777fc260e')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../nitrogen-1.5.2-X11-linker-flags.patch
+  autoreconf -fi
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr

Added: nitrogen-1.5.2-X11-linker-flags.patch
===================================================================
--- nitrogen-1.5.2-X11-linker-flags.patch	                        (rev 0)
+++ nitrogen-1.5.2-X11-linker-flags.patch	2014-08-18 08:58:44 UTC (rev 220198)
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 05fa03b..1f275d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,10 +34,10 @@ PKG_CHECK_MODULES(GLIB2,[glib-2.0 >= $GLIB2_VERSION])
+ PKG_CHECK_MODULES(GTK2,[gtk+-2.0 >= $GTK2_VERSION])
+ PKG_CHECK_MODULES(GTKMM2, [gtkmm-2.4 >= $GTKMM2_VERSION])
+ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GTHREAD2_VERSION])
++PKG_CHECK_MODULES(X11, x11)
+ 
+-
+-NITROGEN_LIBS="$GLIB2_LIBS $GTK2_LIBS $GTKMM2_LIBS $GTHREAD2_LIBS"
+-NITROGEN_CFLAGS="$GLIB2_CFLAGS $GTK2_CFLAGS $GTKMM2_CFLAGS $GTHREAD2_CFLAGS"
++NITROGEN_LIBS="$GLIB2_LIBS $GTK2_LIBS $GTKMM2_LIBS $GTHREAD2_LIBS $X11_LIBS"
++NITROGEN_CFLAGS="$GLIB2_CFLAGS $GTK2_CFLAGS $GTKMM2_CFLAGS $GTHREAD2_CFLAGS $X11_CFLAGS"
+ 
+ dnl do some autotools picen to get inotify
+ AC_ARG_ENABLE(inotify, [  --disable-inotify       disable support for inotify watching of dirs (default: enabled)], [enable_inotify=$enableval],[enable_inotify=yes])