Date: Saturday, April 19, 2014 @ 05:28:50 Author: fyan Revision: 109810
upgpkg: agg 1:2.4r93-1 - switch to a maintained fork, address FS#39936 Modified: agg/trunk/PKGBUILD Deleted: agg/trunk/agg-2.4-depends.patch agg/trunk/agg-2.5-pkgconfig.patch -------------------------+ PKGBUILD | 31 ++++++++++++++--------------- agg-2.4-depends.patch | 48 ---------------------------------------------- agg-2.5-pkgconfig.patch | 10 --------- 3 files changed, 15 insertions(+), 74 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-19 02:46:38 UTC (rev 109809) +++ PKGBUILD 2014-04-19 03:28:50 UTC (rev 109810) @@ -2,34 +2,30 @@ # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> pkgname=agg -pkgver=2.5 -pkgrel=5 +_svnver=93 +pkgver=2.4r$_svnver +pkgrel=1 +epoch=1 pkgdesc="A High Quality Rendering Engine for C++" arch=('i686' 'x86_64') -url="http://www.antigrain.com/" -license=('GPL') +url="http://sourceforge.net/p/agg/" +license=('BSD') depends=('gcc-libs' 'sdl' 'freetype2') +makedepends=('subversion') provides=('antigrain') replaces=('antigrain') -options=('!makeflags') -source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz" - agg-2.4-depends.patch - agg-2.5-pkgconfig.patch +source=("$pkgname::svn://svn.code.sf.net/p/agg/svn#revision=$_svnver" autotools.patch) -md5sums=('0229a488bc47be10a2fee6cf0b2febd6' - '22f8e48c137d25038181c86d5e40b110' - '43a19a7b1564c591e56c8d09a0fd8da5' +md5sums=('SKIP' 'e042231955a8daee5f3cdfa4ee4e866a') prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/agg-2.4-depends.patch" - patch -p1 -i "${srcdir}/agg-2.5-pkgconfig.patch" + cd $pkgname/$pkgname-2.4 patch -p0 -i "${srcdir}/autotools.patch" } build() { - cd ${pkgname}-${pkgver} + cd $pkgname/$pkgname-2.4 sh ./autogen.sh ./configure --prefix=/usr --disable-static make @@ -36,6 +32,9 @@ } package() { - cd ${pkgname}-${pkgver} + cd $pkgname/$pkgname-2.4 make DESTDIR="${pkgdir}" install + + install -d "$pkgdir/usr/share/licenses/$pkgname" + sed -n 5,11p README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } Deleted: agg-2.4-depends.patch =================================================================== --- agg-2.4-depends.patch 2014-04-19 02:46:38 UTC (rev 109809) +++ agg-2.4-depends.patch 2014-04-19 03:28:50 UTC (rev 109810) @@ -1,48 +0,0 @@ ---- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100 -+++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100 -@@ -4,8 +4,9 @@ - agginclude_HEADERS = agg_font_freetype.h - lib_LTLIBRARIES = libaggfontfreetype.la - --libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ -+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ - libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp - libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ -+libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@ - endif - ---- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100 -+++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100 -@@ -5,6 +5,6 @@ - libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ - libaggplatformsdl_la_SOURCES = agg_platform_support.cpp - libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@ --libaggplatformsdl_la_LIBADD = @SDL_LIBS@ -+libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@ - endif - ---- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100 -+++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000 -@@ -122,7 +122,8 @@ - fi - AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) - AC_SUBST(x_includes) --AC_SUBST(x_libraries) -+test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries" -+AC_SUBST(X_LDFLAGS) - dnl ############################################### - - dnl Settung up library version ---- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000 -+++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000 -@@ -1,8 +1,8 @@ - if ENABLE_X11 - lib_LTLIBRARIES = libaggplatformX11.la - --libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ -+libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@ - libaggplatformX11_la_SOURCES = agg_platform_support.cpp - libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ --libaggplatformX11_la_LIBADD = -lX11 -+libaggplatformX11_la_LIBADD = ../../libagg.la -lX11 - endif Deleted: agg-2.5-pkgconfig.patch =================================================================== --- agg-2.5-pkgconfig.patch 2014-04-19 02:46:38 UTC (rev 109809) +++ agg-2.5-pkgconfig.patch 2014-04-19 03:28:50 UTC (rev 109810) @@ -1,10 +0,0 @@ ---- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000 -+++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000 -@@ -6,5 +6,6 @@ - Name: libagg - Description: Anti Grain Geometry - A High Quality Rendering Engine for C++ - Version: @VERSION@ --Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg -+Requires.private: freetype2 -+Libs: -L${libdir} -lagg - Cflags: -I${includedir}