[arch-commits] Commit in gtklp/trunk (ChangeLog PKGBUILD gtklp-gtk1.patch)

Eric Bélanger eric at archlinux.org
Fri Jul 9 21:08:17 EDT 2010


    Date: Friday, July 9, 2010 @ 21:08:16
  Author: eric
Revision: 85189

upgpkg: gtklp 1.2.8-1
Upstream update

Modified:
  gtklp/trunk/PKGBUILD
Deleted:
  gtklp/trunk/ChangeLog
  gtklp/trunk/gtklp-gtk1.patch

------------------+
 ChangeLog        |    7 -------
 PKGBUILD         |   19 +++++++++++--------
 gtklp-gtk1.patch |   28 ----------------------------
 3 files changed, 11 insertions(+), 43 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-07-09 22:52:51 UTC (rev 85188)
+++ ChangeLog	2010-07-10 01:08:16 UTC (rev 85189)
@@ -1,7 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-09 22:52:51 UTC (rev 85188)
+++ PKGBUILD	2010-07-10 01:08:16 UTC (rev 85189)
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=gtklp
-pkgver=1.2.7
+pkgver=1.2.8
 pkgrel=1
 pkgdesc="Tools to use and administrate CUPS"
 arch=('i686' 'x86_64')
@@ -10,17 +10,20 @@
 license=('GPL')
 depends=('gtk2')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('4006867860704e359bc9b871db9f9530')
+md5sums=('65c7089140b5f8e2a0b282b3083b78ae')
+sha1sums=('a881cc8705dcc96bba806929679b5392fb20c72d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  chmod +x autogen.sh || return 1
-  ./autogen.sh || return 1
+  chmod +x autogen.sh
+  ./autogen.sh
   aclocal -I m4
   autoconf
+  ./configure --prefix=/usr
+  make
+}
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Deleted: gtklp-gtk1.patch
===================================================================
--- gtklp-gtk1.patch	2010-07-09 22:52:51 UTC (rev 85188)
+++ gtklp-gtk1.patch	2010-07-10 01:08:16 UTC (rev 85189)
@@ -1,28 +0,0 @@
-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