From 1af647b30c70a394046902d1aaa4202150bdf150 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 11 Nov 2010 22:27:11 +0000 Subject: File cleanup --- abs/extra/libgdiplus/system-cairo.patch | 67 ------------------------------ abs/extra/libgpg-error/PKGBUILD | 33 --------------- abs/extra/neon/PKGBUILD | 29 ------------- abs/extra/subversion/ChangeLog | 66 ----------------------------- abs/extra/subversion/__changelog | 1 - abs/extra/subversion/subversion-neon.patch | 62 --------------------------- 6 files changed, 258 deletions(-) delete mode 100644 abs/extra/libgdiplus/system-cairo.patch delete mode 100644 abs/extra/libgpg-error/PKGBUILD delete mode 100644 abs/extra/neon/PKGBUILD delete mode 100644 abs/extra/subversion/ChangeLog delete mode 100644 abs/extra/subversion/__changelog delete mode 100644 abs/extra/subversion/subversion-neon.patch diff --git a/abs/extra/libgdiplus/system-cairo.patch b/abs/extra/libgdiplus/system-cairo.patch deleted file mode 100644 index b605a3e..0000000 --- a/abs/extra/libgdiplus/system-cairo.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ur libgdiplus-1.1.15-old/Makefile.am libgdiplus-1.1.15/Makefile.am ---- libgdiplus-1.1.15-old/Makefile.am 2006-04-14 10:04:55.000000000 -0700 -+++ libgdiplus-1.1.15/Makefile.am 2006-04-21 18:06:49.000000000 -0700 -@@ -1,4 +1,4 @@ --SUBDIRS = cairo src tests -+SUBDIRS = src tests - #libpixman - - pkgconfigdir = $(libdir)/pkgconfig -diff -ur libgdiplus-1.1.15-old/configure.in libgdiplus-1.1.15/configure.in ---- libgdiplus-1.1.15-old/configure.in 2006-04-14 10:04:55.000000000 -0700 -+++ libgdiplus-1.1.15/configure.in 2006-04-21 18:06:49.000000000 -0700 -@@ -18,32 +18,32 @@ - AC_MSG_ERROR("Did not find Glib >= 2.2.3"); - fi - --AC_CONFIG_SUBDIRS(cairo) --CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' --CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' --AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) -+#AC_CONFIG_SUBDIRS(cairo) -+#CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' -+#CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' -+#AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) - - # Activate this when we support linking to an already exiting Cairo installation --#default_cairo=included --#AC_ARG_WITH(cairo, [ --with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo]) -+default_cairo=included -+AC_ARG_WITH(cairo, [ --with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo]) - # --#if test $cairo_v = "included"; --#then -+if test $cairo_v = "included"; -+then - # #AC_CONFIG_SUBDIRS(libpixman) --# AC_CONFIG_SUBDIRS(cairo) --# CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' --# CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' --# AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) --#else --# if pkg-config --exact-version 0.3.0 cairo; then --# echo Cairo installation OK --# else --# AC_MSG_ERROR("Did not find Cairo == 0.3.0"); --# fi --# --# CAIRO_LIBS="`pkg-config --libs cairo`" --# CAIRO_CFLAGS="`pkg-config --cflags cairo`" --#fi -+ AC_CONFIG_SUBDIRS(cairo) -+ CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la' -+ CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src' -+ AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) -+else -+ if pkg-config --atleast-version 1.0.1 cairo; then -+ echo Cairo installation OK -+ else -+ AC_MSG_ERROR("Did not find Cairo == 1.0.1"); -+ fi -+ -+ CAIRO_LIBS="`pkg-config --libs cairo`" -+ CAIRO_CFLAGS="`pkg-config --cflags cairo`" -+fi - - GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `pkg-config freetype2 fontconfig --libs`" - GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `pkg-config freetype2 fontconfig --cflags`" diff --git a/abs/extra/libgpg-error/PKGBUILD b/abs/extra/libgpg-error/PKGBUILD deleted file mode 100644 index 1c12394..0000000 --- a/abs/extra/libgpg-error/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 87301 2010-08-12 05:22:29Z andyrtr $ -# Maintainer: judd - -pkgname=libgpg-error -pkgver=1.9 -pkgrel=2 -pkgdesc="Support library for libgcrypt" -arch=(i686 x86_64) -url="http://www.gnupg.org" -license=('LGPL') -depends=('glibc' 'sh') -options=(!libtool) -source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) -md5sums=('521b98aa9395e7eaf0ef2236233a0796') - - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}/" install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/ - ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so -} - diff --git a/abs/extra/neon/PKGBUILD b/abs/extra/neon/PKGBUILD deleted file mode 100644 index c87a5f0..0000000 --- a/abs/extra/neon/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 77208 2010-04-11 13:31:45Z pierre $ -# Contributor: Tom Newsom -# Maintainer: Juergen Hoetzel - -# KEEP LIBTOOL FILES! -pkgname=neon -pkgver=0.29.3 -pkgrel=2 -pkgdesc="HTTP and WebDAV client library with a C interface" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('heimdal' 'expat' 'ca-certificates') -url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba1015b59c112d44d7797b62fe7bee51') -options=('libtool') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-expat --enable-shared --disable-static \ - --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/abs/extra/subversion/ChangeLog b/abs/extra/subversion/ChangeLog deleted file mode 100644 index b223bd8..0000000 --- a/abs/extra/subversion/ChangeLog +++ /dev/null @@ -1,66 +0,0 @@ -2009-12-27 Ionut Biru - - * subversion 1.6.6-3: adding svn bash completion script - -2009-08-07 Douglas Soares de Andrade - - * Updated to: 1.6.4 - -2009-08-02 Eric Belanger - - * subversion 1.6.3-2: Rebuilt against ruby 1.9 - -2009-06-07 Douglas Soares de Andrade - - * Now hopefully fixed git issues - -2009-05-16 Douglas Soares de Andrade - - * Fixing wrong link against ruby 1.9 - -2009-05-11 Douglas Soares de Andrade - - * Updated for i686: 1.6.2 - -2009-04-17 Douglas Soares de Andrade - - * Back to use svnmerge.py from trunk - -2009-04-11 Douglas Soares de Andrade - - * Removing libtool files - -2009-04-10 Douglas Soares de Andrade - - * Updated for i686: 1.6.1 - * Added gerardo patch to fix insecure rpaths - -2009-03-24 Douglas Soares de Andrade - - * Added sqlite3 as a dep - -2009-03-21 Douglas Soares de Andrade - - * Updated for i686: 1.6.0 - -2009-02-26 Douglas Soares de Andrade - - * Updated for i686: 1.5.6 - -2008-10-10 Douglas Soares de Andrade - - * Updated for i686: 1.5.3 - -2008-09-04 Douglas Soares de Andrade - - * 1.5.2: Finally updated for i686 as it does not break the - devtools. - -2008-08-13 Douglas Soares de Andrade - - * Updated for i686: 1.5.1 - -2008-07-23 Douglas Soares de Andrade - - * Updated for i686: 1.5.0 - diff --git a/abs/extra/subversion/__changelog b/abs/extra/subversion/__changelog deleted file mode 100644 index b91d08d..0000000 --- a/abs/extra/subversion/__changelog +++ /dev/null @@ -1 +0,0 @@ -removed kwallet and gnome diff --git a/abs/extra/subversion/subversion-neon.patch b/abs/extra/subversion/subversion-neon.patch deleted file mode 100644 index 7dc23c5..0000000 --- a/abs/extra/subversion/subversion-neon.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: subversion-1.4.6/build/ac-macros/neon.m4 -=================================================================== ---- subversion-1.4.6.orig/build/ac-macros/neon.m4 -+++ subversion-1.4.6/build/ac-macros/neon.m4 -@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON, - NEON_VERSION=`cat $abs_srcdir/neon/.version` - AC_MSG_RESULT([$NEON_VERSION]) - -- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], - [Define to 1 if you have Neon 0.25 or later.]) - fi -- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], - [Define to 1 if you have Neon 0.26 or later.]) - fi -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then -+ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], -+ [Define to 1 if you have Neon 0.27 or later.]) -+ fi - - for svn_allowed_neon in $NEON_ALLOWED_LIST; do - if test "$NEON_VERSION" = "$svn_allowed_neon" || -@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG, - NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` - AC_MSG_RESULT([$NEON_VERSION]) - -- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], - [Define to 1 if you have Neon 0.25 or later.]) - fi -- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], - [Define to 1 if you have Neon 0.26 or later.]) - fi -+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then -+ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], -+ [Define to 1 if you have Neon 0.27 or later.]) -+ fi - - for svn_allowed_neon in $NEON_ALLOWED_LIST; do - if test "$NEON_VERSION" = "$svn_allowed_neon" || -Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c -=================================================================== ---- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c -+++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c -@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t - } neonprogress_baton_t; - - static void -+#ifdef SVN_NEON_0_27 -+ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total) -+#else - ra_dav_neonprogress(void *baton, off_t progress, off_t total) -+#endif /* SVN_NEON_0_27 */ - { - const neonprogress_baton_t *neonprogress_baton = baton; - if (neonprogress_baton->progress_func) -- cgit v0.12