Date: Tuesday, November 29, 2011 @ 05:37:04 Author: bluewind Revision: 143784
archrelease: copy trunk to extra-i686, extra-x86_64 Added: qrencode/repos/extra-i686/PKGBUILD (from rev 143783, qrencode/trunk/PKGBUILD) qrencode/repos/extra-x86_64/PKGBUILD (from rev 143783, qrencode/trunk/PKGBUILD) Deleted: qrencode/repos/extra-i686/PKGBUILD qrencode/repos/extra-i686/libpng14.diff qrencode/repos/extra-x86_64/PKGBUILD qrencode/repos/extra-x86_64/libpng14.diff ----------------------------+ extra-i686/PKGBUILD | 61 +++++++++++++++++++--------------------- extra-i686/libpng14.diff | 65 ------------------------------------------- extra-x86_64/PKGBUILD | 61 +++++++++++++++++++--------------------- extra-x86_64/libpng14.diff | 65 ------------------------------------------- 4 files changed, 60 insertions(+), 192 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-11-29 10:36:11 UTC (rev 143783) +++ extra-i686/PKGBUILD 2011-11-29 10:37:04 UTC (rev 143784) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz< f...@xinu.at> -# Contributor: Dany Martineau <dany.luc.martin...@gmail.com> - -pkgname=qrencode -pkgver=3.1.1 -pkgrel=2 -pkgdesc="C library for encoding data in a QR Code symbol." -arch=(i686 x86_64) -depends=('libpng>=1.4.0') -makedepends=(sdl) -url="http://megaui.net/fukuchi/works/qrencode/index.en.html" -license=('GPL') -options=(!libtool) -source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng14.diff) -md5sums=('e7feb2c2c65d0f2f4010a14da3ecdb89' '93e87b2751b0d422a08e96ccaae4d082') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - patch -p1 < "$srcdir/libpng14.diff" - autoreconf - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make prefix="$pkgdir/usr" install -} Copied: qrencode/repos/extra-i686/PKGBUILD (from rev 143783, qrencode/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-11-29 10:37:04 UTC (rev 143784) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Florian Pritz< f...@xinu.at> +# Contributor: Dany Martineau <dany.luc.martin...@gmail.com> + +pkgname=qrencode +pkgver=3.2.0 +pkgrel=1 +pkgdesc="C library for encoding data in a QR Code symbol." +arch=(i686 x86_64) +depends=('libpng>=1.4.0') +makedepends=(sdl) +url="http://megaui.net/fukuchi/works/qrencode/index.en.html" +license=('GPL') +options=(!libtool) +source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7e90615eb314abcd2eb2eab5c8155b97') + +build() { + cd "${srcdir}/$pkgname-$pkgver" +# autoreconf + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install +} Deleted: extra-i686/libpng14.diff =================================================================== --- extra-i686/libpng14.diff 2011-11-29 10:36:11 UTC (rev 143783) +++ extra-i686/libpng14.diff 2011-11-29 10:37:04 UTC (rev 143784) @@ -1,65 +0,0 @@ -diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure qrencode-3.1.1-ok/configure ---- qrencode-3.1.1/configure 2010-02-02 19:43:16.000000000 -0500 -+++ qrencode-3.1.1-ok/configure 2010-02-03 21:41:43.205709796 -0500 -@@ -11445,12 +11445,12 @@ - pkg_cv_png_CFLAGS="$png_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null` -+ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng14"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11463,12 +11463,12 @@ - pkg_cv_png_LIBS="$png_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null` -+ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng14"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11487,14 +11487,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""` -+ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng14""` - else -- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""` -+ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng14""` - fi - # Put the nasty error message in config.log where it belongs - echo "$png_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (\"libpng12\") were not met: -+ as_fn_error "Package requirements (\"libpng14\") were not met: - - $png_PKG_ERRORS - -diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure.ac qrencode-3.1.1-ok/configure.ac ---- qrencode-3.1.1/configure.ac 2010-02-02 19:42:12.000000000 -0500 -+++ qrencode-3.1.1-ok/configure.ac 2010-02-03 21:42:07.202419056 -0500 -@@ -36,7 +36,7 @@ - [build_tools=$withval], [build_tools=yes]) - AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ]) - if test x$build_tools = xyes ; then -- PKG_CHECK_MODULES(png, "libpng12") -+ PKG_CHECK_MODULES(png, "libpng14") - fi - - dnl --with-tests Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-11-29 10:36:11 UTC (rev 143783) +++ extra-x86_64/PKGBUILD 2011-11-29 10:37:04 UTC (rev 143784) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz< f...@xinu.at> -# Contributor: Dany Martineau <dany.luc.martin...@gmail.com> - -pkgname=qrencode -pkgver=3.1.1 -pkgrel=2 -pkgdesc="C library for encoding data in a QR Code symbol." -arch=(i686 x86_64) -depends=('libpng>=1.4.0') -makedepends=(sdl) -url="http://megaui.net/fukuchi/works/qrencode/index.en.html" -license=('GPL') -options=(!libtool) -source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng14.diff) -md5sums=('e7feb2c2c65d0f2f4010a14da3ecdb89' '93e87b2751b0d422a08e96ccaae4d082') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - patch -p1 < "$srcdir/libpng14.diff" - autoreconf - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make prefix="$pkgdir/usr" install -} Copied: qrencode/repos/extra-x86_64/PKGBUILD (from rev 143783, qrencode/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-11-29 10:37:04 UTC (rev 143784) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Florian Pritz< f...@xinu.at> +# Contributor: Dany Martineau <dany.luc.martin...@gmail.com> + +pkgname=qrencode +pkgver=3.2.0 +pkgrel=1 +pkgdesc="C library for encoding data in a QR Code symbol." +arch=(i686 x86_64) +depends=('libpng>=1.4.0') +makedepends=(sdl) +url="http://megaui.net/fukuchi/works/qrencode/index.en.html" +license=('GPL') +options=(!libtool) +source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7e90615eb314abcd2eb2eab5c8155b97') + +build() { + cd "${srcdir}/$pkgname-$pkgver" +# autoreconf + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install +} Deleted: extra-x86_64/libpng14.diff =================================================================== --- extra-x86_64/libpng14.diff 2011-11-29 10:36:11 UTC (rev 143783) +++ extra-x86_64/libpng14.diff 2011-11-29 10:37:04 UTC (rev 143784) @@ -1,65 +0,0 @@ -diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure qrencode-3.1.1-ok/configure ---- qrencode-3.1.1/configure 2010-02-02 19:43:16.000000000 -0500 -+++ qrencode-3.1.1-ok/configure 2010-02-03 21:41:43.205709796 -0500 -@@ -11445,12 +11445,12 @@ - pkg_cv_png_CFLAGS="$png_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null` -+ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng14"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11463,12 +11463,12 @@ - pkg_cv_png_LIBS="$png_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null` -+ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng14"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11487,14 +11487,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""` -+ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng14""` - else -- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""` -+ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng14""` - fi - # Put the nasty error message in config.log where it belongs - echo "$png_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (\"libpng12\") were not met: -+ as_fn_error "Package requirements (\"libpng14\") were not met: - - $png_PKG_ERRORS - -diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure.ac qrencode-3.1.1-ok/configure.ac ---- qrencode-3.1.1/configure.ac 2010-02-02 19:42:12.000000000 -0500 -+++ qrencode-3.1.1-ok/configure.ac 2010-02-03 21:42:07.202419056 -0500 -@@ -36,7 +36,7 @@ - [build_tools=$withval], [build_tools=yes]) - AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ]) - if test x$build_tools = xyes ; then -- PKG_CHECK_MODULES(png, "libpng12") -+ PKG_CHECK_MODULES(png, "libpng14") - fi - - dnl --with-tests