[arch-commits] Commit in fluxter/trunk (3 files)

[Eric Bélanger]

    Date: Sunday, May 8, 2011 @ 22:48:19
  Author: eric
Revision: 123175

upgpkg: fluxter 0.1.0-5
Removed libsm depends, Added build patch

Added:
  fluxter/trunk/fluxter-0.1.0-asneeded.patch
Modified:
  fluxter/trunk/PKGBUILD
Deleted:
  fluxter/trunk/ChangeLog

------------------------------+
 ChangeLog                    |    6 -----
 PKGBUILD                     |   30 ++++++++++++++++++----------
 fluxter-0.1.0-asneeded.patch |   43 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 17 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-05-09 02:21:28 UTC (rev 123174)
+++ ChangeLog	2011-05-09 02:48:19 UTC (rev 123175)
@@ -1,6 +0,0 @@
-2009-03-13  Eric Belanger  <eric at archlinux.org>
-
-	* fluxter 0.1.0-4
-	* Added license
-	* Replaced gcc depends by gcc-libs
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-09 02:21:28 UTC (rev 123174)
+++ PKGBUILD	2011-05-09 02:48:19 UTC (rev 123175)
@@ -1,22 +1,30 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Ben <ben at benmazer.ner>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=fluxter
 pkgver=0.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A workspace pager for fluxbox"
 arch=('i686' 'x86_64')
 url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html"
 license=('GPL')
-depends=('gcc-libs' 'libx11' 'libsm')
-source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6d18553220e8fc33c54762d2e7d31528')
-sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc')
+depends=('gcc-libs' 'libx11')
+source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \
+        fluxter-0.1.0-asneeded.patch)
+md5sums=('6d18553220e8fc33c54762d2e7d31528'
+         '3deb4e816d12a262455bc8281fa82577')
+sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc'
+          '2fc912d40233577b34cb6c641e066863e487fab0')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../fluxter-0.1.0-asneeded.patch
+  autoreconf
+  ./configure --prefix=/usr
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Added: fluxter-0.1.0-asneeded.patch
===================================================================
--- fluxter-0.1.0-asneeded.patch	                        (rev 0)
+++ fluxter-0.1.0-asneeded.patch	2011-05-09 02:48:19 UTC (rev 123175)
@@ -0,0 +1,43 @@
+--- Makefile.am
++++ Makefile.am
+@@ -17,4 +17,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-fluxter_LDADD = @X_LIBS@
++fluxter_LDADD = @LIBS@
+--- configure.in
++++ configure.in
+@@ -18,14 +18,12 @@
+ [
+  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CFLAGS" = "" && CFLAGS="-Wall"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -71,12 +69,12 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC