[arch-commits] Commit in imlib2/repos (3 files)

[Eric Belanger]

    Date: Sunday, June 15, 2008 @ 16:04:40
  Author: eric
Revision: 2920

fixed svn conflict

Modified:
  imlib2/repos/extra-x86_64/	(properties)
  imlib2/repos/extra-x86_64/PKGBUILD
Deleted:
  imlib2/repos/extra-x86_64/pkgconfig.patch

-----------------+
 PKGBUILD        |   12 +++++++-----
 pkgconfig.patch |   24 ------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)


Property changes on: imlib2/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /imlib2/trunk:1
   + /imlib2/trunk:1-2919

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-15 20:03:16 UTC (rev 2919)
+++ extra-x86_64/PKGBUILD	2008-06-15 20:04:40 UTC (rev 2920)
@@ -2,15 +2,16 @@
 # Maintainer: arjan <arjan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 pkgname=imlib2
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Imlib2 is the successor to Imlib. It is NOT a newer version -- Imlib 2 can be installed alongside Imlib 1.x"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://sourceforge.net/projects/enlightenment"
+license=('BSD')
 depends=('libtiff' 'libungif' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag')
-source=(http://heanet.dl.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
-md5sums=('69f7ee996c943142332b4c98597b095c')
+source=(http://downloads.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz)
+md5sums=('16a3d885e523303be794282c0ed90841')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -20,7 +21,8 @@
   # Disable AMD64 optimizations due to bug in assembler code
   [ "${CARCH}" = "x86_64" ] && EXTRAOPTS="--disable-amd64"
 
-  ./configure --prefix=/usr --sysconfdir=/etc/imlib2 $EXTRAOPTS
+  ./configure --prefix=/usr --sysconfdir=/etc/imlib2 --x-libraries=/usr/lib $EXTRAOPTS
   make || return 1
   make DESTDIR=$startdir/pkg install
+  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt
 }

Deleted: extra-x86_64/pkgconfig.patch
===================================================================
--- extra-x86_64/pkgconfig.patch	2008-06-15 20:03:16 UTC (rev 2919)
+++ extra-x86_64/pkgconfig.patch	2008-06-15 20:04:40 UTC (rev 2920)
@@ -1,24 +0,0 @@
-diff -urNad imlib2-1.2.0.orig/configure.in imlib2-1.2.0/configure.in
---- imlib2-1.2.0.orig/configure.in	2005-01-05 10:39:08.000000000 +0100
-+++ imlib2-1.2.0/configure.in	2005-03-29 20:03:07.000000000 +0200
-@@ -86,6 +86,9 @@
- packagesrcdir=`cd $srcdir && pwd`
- AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
- 
-+# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
-+requirements="freetype2"
-+
- mmx=no
- AC_ARG_ENABLE(mmx,[  --disable-mmx           attempt compiling using mmx assembly [default=yes]],
- [
-@@ -354,7 +357,9 @@
- fi
- AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
- AC_SUBST(BZ2LIBS)
--  
-+
-+AC_SUBST(requirements)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile