[arch-commits] Commit in gtklp/repos (4 files)
Alexander Fehr
alexanderf at archlinux.org
Tue Dec 16 15:23:24 UTC 2008
Date: Tuesday, December 16, 2008 @ 10:23:24
Author: alexanderf
Revision: 21876
Merged revisions 13745,21875 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/gtklp/trunk
........
r13745 | allan | 2008-09-28 16:27:24 +0200 (So, 28 Sep 2008) | 1 line
correct sourceforge url
........
r21875 | alexanderf | 2008-12-16 16:22:37 +0100 (Di, 16 Dez 2008) | 1 line
upgpkg: gtklp 1.2.6-5
........
Added:
gtklp/repos/extra-i686/ChangeLog
(from rev 21875, gtklp/trunk/ChangeLog)
gtklp/repos/extra-i686/gtklp-gtk1.patch
(from rev 21875, gtklp/trunk/gtklp-gtk1.patch)
Modified:
gtklp/repos/extra-i686/ (properties)
gtklp/repos/extra-i686/PKGBUILD
------------------+
ChangeLog | 7 +++++++
PKGBUILD | 34 +++++++++++++++++++---------------
gtklp-gtk1.patch | 28 ++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 15 deletions(-)
Property changes on: gtklp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /gtklp/trunk:1-8673
+ /gtklp/trunk:1-21875
Copied: gtklp/repos/extra-i686/ChangeLog (from rev 21875, gtklp/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog (rev 0)
+++ extra-i686/ChangeLog 2008-12-16 15:23:24 UTC (rev 21876)
@@ -0,0 +1,7 @@
+2008-12-16 Alexander Fehr <pizzapunk gmail com>
+
+ * gtklp-1.2.6-5:
+ New maintainer.
+ Rebuilt against latest heimdal.
+ Added patch to make it build without GTK1.
+ Added ChangeLog.
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-12-16 15:22:37 UTC (rev 21875)
+++ extra-i686/PKGBUILD 2008-12-16 15:23:24 UTC (rev 21876)
@@ -1,25 +1,29 @@
# $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
pkgname=gtklp
pkgver=1.2.6
-pkgrel=4
-pkgdesc="GtkLP and GtkLPQ are two tools to use and administrate CUPS a better way."
+pkgrel=5
+pkgdesc="Tools to use and administrate CUPS"
arch=('i686' 'x86_64')
-url='http://gtklp.sf.net'
+url="http://gtklp.sourceforge.net/"
license=('GPL')
-depends=('gtk2' 'libcups')
-makedepends=('autoconf')
-source=(http://heanet.dl.sf.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('69938c99e3163c9ef25e1ed559c74c65')
+depends=('libcups' 'gtk2')
+source=(http://downloads.sourceforge.net/gtklp/gtklp-$pkgver.src.tar.gz
+ gtklp-gtk1.patch)
+md5sums=('69938c99e3163c9ef25e1ed559c74c65'
+ 'e65b07acb1e390f08b5839c3e86c1145')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- autoconf
- chmod +x ./autogen.sh
- ./autogen.sh
- ./configure --prefix=/usr
+ cd "$srcdir/gtklp-$pkgver"
+
+ # Make it build without GTK1
+ patch -Np1 -i "$srcdir/gtklp-gtk1.patch" || return 1
+
+ chmod +x autogen.sh || return 1
+ ./autogen.sh || return 1
+
+ ./configure --prefix=/usr || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR="$pkgdir" install || return 1
}
-
Copied: gtklp/repos/extra-i686/gtklp-gtk1.patch (from rev 21875, gtklp/trunk/gtklp-gtk1.patch)
===================================================================
--- extra-i686/gtklp-gtk1.patch (rev 0)
+++ extra-i686/gtklp-gtk1.patch 2008-12-16 15:23:24 UTC (rev 21876)
@@ -0,0 +1,28 @@
+diff -ur gtklp-1.2.6.orig/configure.in gtklp-1.2.6/configure.in
+--- gtklp-1.2.6.orig/configure.in 2007-11-15 18:56:57.000000000 +0100
++++ gtklp-1.2.6/configure.in 2008-12-16 12:38:39.000000000 +0100
+@@ -43,20 +43,10 @@
+
+ # gtk #######################################################################
+ GTKVER=""
+-if test x$enable_gtk1 = xyes; then
+- AM_PATH_GTK([1.2.8],,[AC_ERROR([GTK+ 1.2.8 or newer is needed for GtkLP!])])
+- GTKVER="-DHAVE_GTK1"
+- OLDDIALOG="-DOLDDIALOG"
+- AC_SUBST(OLDDIALOG)
+-else
+- AC_MSG_RESULT([ ******************************************************** ])
+- AC_MSG_RESULT([ * If checking for Gtk2 fails, try to use --enable-gtk1 * ])
+- AC_MSG_RESULT([ ******************************************************** ])
+- PKG_CHECK_MODULES(GTK2, gtk+-2.0)
+- AC_SUBST(GTK2_CFLAGS)
+- AC_SUBST(GTK2_LIBS)
+- GTKVER="-DHAVE_GTK2"
+-fi
++PKG_CHECK_MODULES(GTK2, gtk+-2.0)
++AC_SUBST(GTK2_CFLAGS)
++AC_SUBST(GTK2_LIBS)
++GTKVER="-DHAVE_GTK2"
+
+ AC_SUBST(GTKVER)
+
More information about the arch-commits
mailing list