summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD36
-rw-r--r--gtkam1.patch11
-rw-r--r--gtkam2.patch11
-rw-r--r--gtkam3.patch75
-rw-r--r--gtkam4.patch11
6 files changed, 19 insertions, 149 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f13ed6a17b2..7e8ddab605ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,21 @@
pkgbase = gtkam
- pkgdesc = A graphical GTK front-end to gphoto2
- pkgver = 0.2.0
- pkgrel = 2
- url = http://gphoto.sourceforge.net/proj/gtkam/
+ pkgdesc = A GTK frontend for libgphoto2
+ pkgver = 1.0
+ pkgrel = 1
+ url = http://gphoto.sourceforge.net/proj/gtkam
arch = i686
arch = x86_64
license = GPL
makedepends = gimp
makedepends = intltool
depends = libgphoto2>=2.5.0
+ depends = libexif>=0.3.2
depends = libexif-gtk
depends = gdk-pixbuf2
- depends = libpng
- source = http://downloads.sourceforge.net/sourceforge/gphoto/gtkam-0.2.0.tar.gz
- source = gtkam1.patch
- source = gtkam2.patch
- source = gtkam3.patch
- source = gtkam4.patch
- md5sums = cbec9eb6ac36b9bedaa5762392ee54bc
- md5sums = eef28ce7fceb27f92c08d5c59a75331d
- md5sums = 7c28b263ec83e70b2a96c3b110483727
- md5sums = d703b0fabdd4d7d81a4fcd294d937c34
- md5sums = 1bd50bdaa806ff74435781745b55962d
+ source = http://downloads.sourceforge.net/project/gphoto/gtkam/1.0/gtkam-1.0.tar.gz
+ source = http://downloads.sourceforge.net/project/gphoto/gtkam/1.0/gtkam-1.0.tar.gz.asc
+ md5sums = f9156394632ac54731d1eea5e2529e7c
+ md5sums = SKIP
pkgname = gtkam
diff --git a/PKGBUILD b/PKGBUILD
index 79c0d98c62fc..961ea146a270 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,39 +2,24 @@
# Maintainer: Valère Monseur <valere dot monseur at ymail dot com>
pkgname=gtkam
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="A graphical GTK front-end to gphoto2"
-url="http://gphoto.sourceforge.net/proj/gtkam/"
+pkgver=1.0
+pkgrel=1
+pkgdesc="A GTK frontend for libgphoto2"
+url="http://gphoto.sourceforge.net/proj/gtkam"
arch=('i686' 'x86_64')
-depends=('libgphoto2>=2.5.0' 'libexif-gtk' 'gdk-pixbuf2' 'libpng')
+depends=('libgphoto2>=2.5.0' 'libexif>=0.3.2' 'libexif-gtk' 'gdk-pixbuf2')
makedepends=('gimp' 'intltool')
license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/gphoto/${pkgname}-${pkgver}.tar.gz
- gtkam1.patch
- gtkam2.patch
- gtkam3.patch
- gtkam4.patch)
-md5sums=('cbec9eb6ac36b9bedaa5762392ee54bc'
- 'eef28ce7fceb27f92c08d5c59a75331d'
- '7c28b263ec83e70b2a96c3b110483727'
- 'd703b0fabdd4d7d81a4fcd294d937c34'
- '1bd50bdaa806ff74435781745b55962d')
+source=(http://downloads.sourceforge.net/project/gphoto/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
+ http://downloads.sourceforge.net/project/gphoto/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz.asc)
+md5sums=('f9156394632ac54731d1eea5e2529e7c'
+ 'SKIP')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/gtkam1.patch"
- patch -p1 -i "${srcdir}/gtkam2.patch"
- patch -p1 -i "${srcdir}/gtkam3.patch"
- patch -p1 -i "${srcdir}/gtkam4.patch"
-
- # needed as patches modify the autotools files
- autoreconf
-
./configure --prefix=/usr --sysconfdir=/etc \
- --without-bonobo --without-gnome \
- --disable-scrollkeeper
+ --without-bonobo --without-gnome --disable-scrollkeeper
make
}
@@ -43,5 +28,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- sed -i -e 's/^_//' "${pkgdir}/usr/share/applications/gtkam.desktop"
}
diff --git a/gtkam1.patch b/gtkam1.patch
deleted file mode 100644
index b7f68e5af46d..000000000000
--- a/gtkam1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am 2009-10-10 11:10:26.000000000 +0200
-+++ b/src/Makefile.am 2011-12-22 09:50:00.793860213 +0100
-@@ -51,7 +51,7 @@ gtkam_LDADD = \
- $(LIBEXIF_LIBS) \
- $(LIBEXIF_GTK_LIBS) \
- $(LIBGPHOTO2_LIBS) \
-- $(GTKAM_LIBS) \
-+ $(GTK_LIBS) \
- $(BONOBO_LIBS) \
- $(GNOME_LIBS) \
- $(INTLLIBS)
diff --git a/gtkam2.patch b/gtkam2.patch
deleted file mode 100644
index 79fd805024d4..000000000000
--- a/gtkam2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aurpN gtkam-0.1.18-old/configure.ac gtkam-0.1.18/configure.ac
---- gtkam-0.1.18-old/configure.ac 2011-12-29 00:04:37.298593338 +0100
-+++ gtkam-0.1.18/configure.ac 2011-12-29 00:05:11.678595916 +0100
-@@ -86,9 +86,7 @@ AC_CHECK_FUNC(gp_port_info_get_name,
- )
- LIBS="$save_LIBS"
-
--PKG_CHECK_MODULES([GTK], [gtk+-2.0])
--AC_SUBST([GTK_CFLAGS])
--AC_SUBST([GTK_LIBS])
-+GP_CHECK_LIBRARY([GTK], [gtk+-2.0])
diff --git a/gtkam3.patch b/gtkam3.patch
deleted file mode 100644
index ef748f092124..000000000000
--- a/gtkam3.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -aurpN gtkam-0.1.18/configure.ac gtkam-0.1.18.new/configure.ac
---- gtkam-0.1.18/configure.ac 2012-05-25 18:16:12.132473203 +0200
-+++ gtkam-0.1.18.new/configure.ac 2012-05-25 18:15:26.042469751 +0200
-@@ -86,7 +86,7 @@ AC_CHECK_FUNC(gp_port_info_get_name,
- )
- LIBS="$save_LIBS"
-
--GP_CHECK_LIBRARY([GTK], [gtk+-2.0])
-+GP_CHECK_LIBRARY([GTK2], [gtk+-2.0])
-
-
- dnl ---------------------------------------------------------------------------
-diff -aurpN gtkam-0.1.18/src/Makefile.am gtkam-0.1.18.new/src/Makefile.am
---- gtkam-0.1.18/src/Makefile.am 2012-05-25 18:16:12.129139870 +0200
-+++ gtkam-0.1.18.new/src/Makefile.am 2012-05-25 18:15:26.042469751 +0200
-@@ -6,7 +6,7 @@ MY_CPPFLAGS = \
- $(LIBEXIF_GTK_CFLAGS) \
- $(LIBGPHOTO2_CFLAGS) \
- $(GNOME_CFLAGS) \
-- $(GTK_CFLAGS) \
-+ $(GTK2_CFLAGS) \
- $(BONOBO_CFLAGS) \
- $(GTKAM_GIMP_CFLAGS)
-
-@@ -46,14 +46,14 @@ gtkam_SOURCES = \
- gtkam-exif.c gtkam-exif.h \
- gtkam-main.c gtkam-main.h \
- i18n.h main.c
--gtkam_LDADD = \
-- libgtkam.a \
-- $(LIBEXIF_LIBS) \
-- $(LIBEXIF_GTK_LIBS) \
-+gtkam_LDADD = \
-+ libgtkam.a \
-+ $(LIBEXIF_LIBS) \
-+ $(LIBEXIF_GTK_LIBS) \
- $(LIBGPHOTO2_LIBS) \
-- $(GTK_LIBS) \
-- $(BONOBO_LIBS) \
-- $(GNOME_LIBS) \
-+ $(GTK2_LIBS) \
-+ $(BONOBO_LIBS) \
-+ $(GNOME_LIBS) \
- $(INTLLIBS)
-
- if HAVE_GIMP
-@@ -69,6 +69,7 @@ gtkam_gimp_LDADD = \
- $(LIBEXIF_LIBS) \
- $(LIBEXIF_GTK_LIBS) \
- $(LIBGPHOTO2_LIBS) \
-+ $(GTK2_LIBS) \
- $(BONOBO_LIBS) \
- $(GNOME_LIBS) \
- $(INTLLIBS)
-diff -aurpN gtkam-0.1.18/test/Makefile.am gtkam-0.1.18.new/test/Makefile.am
---- gtkam-0.1.18/test/Makefile.am 2009-10-10 11:10:25.000000000 +0200
-+++ gtkam-0.1.18.new/test/Makefile.am 2012-05-25 18:15:25.559136406 +0200
-@@ -4,7 +4,7 @@ MY_CPPFLAGS = \
- $(LIBEXIF_GTK_CFLAGS) \
- $(LIBGPHOTO2_CFLAGS) \
- $(GNOME_CFLAGS) \
-- $(GTK_CFLAGS) \
-+ $(GTK2_CFLAGS) \
- $(BONOBO_CFLAGS) \
- $(GTKAM_GIMP_CFLAGS)
-
-@@ -13,7 +13,7 @@ MY_LIBS = \
- $(LIBEXIF_LIBS) \
- $(LIBEXIF_GTK_LIBS) \
- $(LIBGPHOTO2_LIBS) \
-- $(GTK_LIBS) \
-+ $(GTK2_LIBS) \
- $(BONOBO_LIBS) \
- $(INTLLIBS)
-
diff --git a/gtkam4.patch b/gtkam4.patch
deleted file mode 100644
index d1eea3974d5a..000000000000
--- a/gtkam4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aurpN gtkam-0.2.0-a/configure.ac gtkam-0.2.0-b/configure.ac
---- gtkam-0.2.0-a/configure.ac 2012-07-10 09:50:52.000000000 +0200
-+++ gtkam-0.2.0-b/configure.ac 2013-01-20 14:48:23.657405520 +0100
-@@ -32,7 +32,6 @@ dnl ------------------------------------
- dnl Some programs we need
- dnl ---------------------------------------------------------------------------
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- AM_PROG_LIBTOOL
- AC_PROG_INSTALL