diff --git a/avogadro/PKGBUILD b/avogadro/PKGBUILD index fb04792f8..d637a745e 100644 --- a/avogadro/PKGBUILD +++ b/avogadro/PKGBUILD @@ -3,26 +3,25 @@ # # maintainer (x86_64): Giuseppe Calà -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=avogadro -pkgver=1.0.3 +pkgver=1.1.0 pkgrel=1 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') -depends=('eigen' 'openbabel' 'pyqt' 'boost' 'glew' 'python-numpy') +depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy') makedepends=('cmake' 'boost') categories=('education') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('92c2702c1980f70fb6d87a1a58147911') +md5sums=('f4fbef5ffc69cc312b2316426c36a78d') build() { + cd "${srcdir}/${pkgname}-${pkgver}" cd ${srcdir} - mkdir build + mkdir -p build cd build # use the cmake module in system to enable python 2.7 support @@ -30,7 +29,8 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DQT_MKSPECS_RELATIVE=share/qt/mkspecs make } diff --git a/blender/PKGBUILD b/blender/PKGBUILD index a73341ea5..3924065db 100644 --- a/blender/PKGBUILD +++ b/blender/PKGBUILD @@ -4,8 +4,8 @@ # maintainer : Mateusz Krawczuk pkgname=blender -pkgver=2.63.1 -_pkgver=2.63a +pkgver=2.64 +_pkgver=2.64 pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('cmake' 'jack') screenshot=('http://www.blender.org/index.php?eID=tx_cms_showpic&file=uploads%2Fpics%2Fblender_screenshot3_03.png&width=800m&height=600m&bodyTag=%3Cbody%20style%3D%22margin%3A0%3B%20background%3A%23fff%3B%22%3E&wrap=%3Ca%20href%3D%22javascript%3Aclose%28%29%3B%22%3E%20%7C%20%3C%2Fa%3E&md5=cddc8ef0fbe1e90d0d22e78b4911860b') install=blender.install source=(http://download.blender.org/source/$pkgname-$_pkgver.tar.gz) -md5sums=('31a60b3ce5466d965cb7e2648995e092') +md5sums=('caec080d2a3dcd57fe1ca20c51c00e53') build() { cd "$srcdir/$pkgname-$_pkgver" @@ -35,7 +35,6 @@ build() { -DWITH_OPENCOLLADA:BOOL=OFF \ -DWITH_GAMEENGINE:BOOL=ON \ -DWITH_PLAYER:BOOL=ON \ - -DWITH_BUILTIN_GLEW:BOOL=On \ -DWITH_CODEC_FFMPEG:BOOL=ON \ -DPYTHON_VERSION:STRING=3.2 \ -DPYTHON_LIBPATH:STRING=/usr/lib \ @@ -45,10 +44,6 @@ build() { make $MAKEFLAGS - cp -rf "$srcdir"/${pkgname}-$_pkgver/release/plugins/* \ - "$srcdir"/${pkgname}-$_pkgver/source/blender/blenpluginapi/ - cd "$srcdir"/${pkgname}-$_pkgver/source/blender/blenpluginapi - chmod 755 bmake make } @@ -56,11 +51,4 @@ package() { cd "$srcdir/$pkgname-$_pkgver/build" make DESTDIR="${pkgdir}" install python3 -m compileall "${pkgdir}/usr/share/blender" - -# install plugins - install -d -m755 "$pkgdir"/usr/share/blender/${_pkgver%[a-z]}/plugins/{sequence,texture} - cp "$srcdir"/${pkgname}-$_pkgver/source/blender/blenpluginapi/sequence/*.so \ - "$pkgdir"/usr/share/blender/${_pkgver%[a-z]}/plugins/sequence/ - cp "$srcdir"/${pkgname}-$_pkgver/source/blender/blenpluginapi/texture/*.so \ - "$pkgdir"/usr/share/blender/${_pkgver%[a-z]}/plugins/texture/ } diff --git a/calibre/PKGBUILD b/calibre/PKGBUILD index 35dfbe541..f89dba986 100644 --- a/calibre/PKGBUILD +++ b/calibre/PKGBUILD @@ -5,7 +5,7 @@ # contributor: Fabian Kosmale <0inkane@googlemail.com> pkgname=calibre -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ screenshot=('https://lh5.googleusercontent.com/_lG58t3XWd3c/TcNwiXkAx_I/AAAAAAAA install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch') -md5sums=('96f18e8d716590f8e07d407c92767b9a' +md5sums=('a2f668ec7fd2de4555ca1bd4d2a3c251' 'cbf6da95f3885e80d3d8b0ae2733674d') build() { diff --git a/clamav/PKGBUILD b/clamav/PKGBUILD index bcad683d3..dfbff0e02 100644 --- a/clamav/PKGBUILD +++ b/clamav/PKGBUILD @@ -51,6 +51,9 @@ package() { install -D -m644 ../clamav.confd "$pkgdir/etc/conf.d/clamav" install -D -m755 ../clamav "$pkgdir/etc/rc.d/clamav" + # Test fix for http://www.chakra-project.org/bbs/viewtopic.php?pid=60823#p60823 + install -d -m755 "$pkgdir/var/lib/clamav" + # un-distribute databases to require freshclam #rm "$pkgdir"/var/lib/clamav/*.cvd } diff --git a/icedtea-web/PKGBUILD b/icedtea-web/PKGBUILD index 5354fd082..164e45107 100644 --- a/icedtea-web/PKGBUILD +++ b/icedtea-web/PKGBUILD @@ -7,7 +7,7 @@ pkgname=icedtea-web pkgdesc="Provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project." pkgver=1.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') @@ -15,7 +15,7 @@ license=('GPL2') _javaver=7 _jvmdir="/usr/lib/jvm/java-${_javaver}-openjdk" -makedepends=("java-environment=${_javaver}" 'zip' 'qt' 'npapi-sdk' 'rhino' 'junit' 'cups') +makedepends=("java-environment=${_javaver}" 'zip' 'qt' 'npapi-sdk' 'rhino' 'junit' 'cups' 'autoconf') depends=("java-environment=${_javaver}" 'qt' 'desktop-file-utils') categories=('network') install="${pkgname}.install" @@ -24,7 +24,7 @@ source=("http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.g 'replace-gtk-with-qt.patch' 'include_unistd_h.patch') sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f' - '8690ee5e0fdc56b68073ca3a99a9423a938c09d7c01431b1ac70613206eb28f9' + 'f5cefe25440186c80ab2b5b5092d2e64b5415959f98afebe41eabecb9f039c9e' 'e2258177b59c51425dd67327f6c21785a5f49155624db3522ee25e5dfa8537fd') build() { @@ -38,6 +38,8 @@ build() { patch -Np1 -i "${srcdir}/replace-gtk-with-qt.patch" patch -Np1 -i "${srcdir}/include_unistd_h.patch" + autoreconf + ./configure --prefix="${_jvmdir}" \ --with-jdk-home="${_jvmdir}" \ --datarootdir=/usr/share \ diff --git a/icedtea-web/replace-gtk-with-qt.patch b/icedtea-web/replace-gtk-with-qt.patch index e3b5ad2eb..9417de3ca 100644 --- a/icedtea-web/replace-gtk-with-qt.patch +++ b/icedtea-web/replace-gtk-with-qt.patch @@ -1,6 +1,6 @@ diff -Naur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2012-09-09 14:22:15.015528849 +0000 -+++ b/Makefile.in 2012-09-09 15:13:18.018935366 +0000 +--- a/Makefile.in 2012-10-09 00:30:11.534668663 +0000 ++++ b/Makefile.in 2012-10-09 00:30:27.207914565 +0000 @@ -107,8 +107,8 @@ GLIB2_V_216_LIBS = @GLIB2_V_216_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ @@ -30,399 +30,82 @@ diff -Naur a/Makefile.in b/Makefile.in @ENABLE_PLUGIN_TRUE@ $(MOZILLA_LIBS)\ @ENABLE_PLUGIN_TRUE@ -shared -o $@ -diff -Naur a/configure b/configure ---- a/configure 2012-09-09 14:22:15.002195366 +0000 -+++ b/configure 2012-09-09 15:11:58.656031883 +0000 -@@ -604,8 +604,9 @@ - MOZILLA_CFLAGS - GLIB_LIBS - GLIB_CFLAGS --GTK_LIBS --GTK_CFLAGS -+QT4_LIBS -+QT4_CFLAGS -+MOC - PKG_CONFIG_LIBDIR - PKG_CONFIG_PATH - PKG_CONFIG -@@ -755,7 +756,7 @@ - with_jarsigner - with_pkgversion - enable_plugin --with_gtk -+with_qt4 - with_jre_home - with_java - with_firefox -@@ -783,8 +784,8 @@ - PKG_CONFIG - PKG_CONFIG_PATH - PKG_CONFIG_LIBDIR --GTK_CFLAGS --GTK_LIBS -+QT4_CFLAGS -+QT4_LIBS - GLIB_CFLAGS - GLIB_LIBS - MOZILLA_CFLAGS -@@ -1436,7 +1437,6 @@ - run-netx-dist - --with-pkgversion=PKG Use PKG in the version string in addition to - "IcedTea" -- --with-gtk=2|3|default the GTK+ version to use (default: 3) - --with-jre-home jre home directory (default is the JRE under the - JDK) - --with-java specify location of the 1.5 java vm -@@ -1469,8 +1469,8 @@ - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path -- GTK_CFLAGS C compiler flags for GTK, overriding pkg-config -- GTK_LIBS linker flags for GTK, overriding pkg-config -+ QT4_CFLAGS C compiler flags for Qt 4, overriding pkg-config -+ QT4_LIBS linker flags for Qt 4, overriding pkg-config - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config - MOZILLA_CFLAGS -@@ -6377,107 +6377,36 @@ +diff -Naur a/acinclude.m4 b/acinclude.m4 +--- a/acinclude.m4 2012-10-09 00:30:11.521335339 +0000 ++++ b/acinclude.m4 2012-10-09 00:43:56.296867625 +0000 +@@ -359,34 +359,21 @@ + AC_MSG_RESULT(${enable_plugin}) + ]) - if test "x${enable_plugin}" = "xyes" ; then +-dnl ITW_GTK_CHECK_VERSION([gtk version]) +-AC_DEFUN([ITW_GTK_CHECK_VERSION], ++dnl ITW_QT_CHECK_VERSION([]) ++AC_DEFUN([ITW_QT_CHECK_VERSION], + [ +- AC_MSG_CHECKING([for GTK$1 version]) +- GTK_VER=`$PKG_CONFIG --modversion gtk+-$1.0` +- AC_MSG_RESULT([$GTK_VER]) ++ AC_MSG_CHECKING([for Qt]) ++ QT_VER=`$PKG_CONFIG --modversion QtGui` ++ AC_MSG_RESULT([$QT_VER]) + ]) --# Check whether --with-gtk was given. --if test "${with_gtk+set}" = set; then : -- withval=$with_gtk; case "$with_gtk" in -- 2|3|default) ;; -- *) as_fn_error $? "invalid GTK version specified" "$LINENO" 5 ;; -- esac --else -- with_gtk=default --fi -- -- -- case "$with_gtk" in +-dnl ITW_GTK_CHECK([gtk version]) +-AC_DEFUN([ITW_GTK_CHECK], ++dnl ITW_QT_CHECK([]) ++AC_DEFUN([ITW_QT_CHECK], + [ +- case "$1" in - default) -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 --$as_echo_n "checking for GTK... " >&6; } -- --if test -n "$GTK_CFLAGS"; then -- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$GTK_LIBS"; then -- pkg_cv_GTK_LIBS="$GTK_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0" 2>&1` -- else -- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GTK_PKG_ERRORS" >&5 -- -- - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 --$as_echo_n "checking for GTK... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt 4" >&5 -+$as_echo_n "checking for Qt 4... " >&6; } - --if test -n "$GTK_CFLAGS"; then -- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" -+if test -n "$QT4_CFLAGS"; then -+ pkg_cv_QT4_CFLAGS="$QT4_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.3 QtCore >= 4.3\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "QtGui >= 4.3 QtCore >= 4.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null` -+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= 4.3 QtCore >= 4.3" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$GTK_LIBS"; then -- pkg_cv_GTK_LIBS="$GTK_LIBS" -+if test -n "$QT4_LIBS"; then -+ pkg_cv_QT4_LIBS="$QT4_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.3 QtCore >= 4.3\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "QtGui >= 4.3 QtCore >= 4.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null` -+ pkg_cv_QT4_LIBS=`$PKG_CONFIG --libs "QtGui >= 4.3 QtCore >= 4.3" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -6497,210 +6426,21 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1` -+ QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtGui >= 4.3 QtCore >= 4.3" 2>&1` - else -- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1` -+ QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtGui >= 4.3 QtCore >= 4.3" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$GTK_PKG_ERRORS" >&5 -- -- as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5 -+ echo "$QT4_PKG_ERRORS" >&5 -+ as_fn_error $? "Qt 4 $with_qt4 not found" "$LINENO" 5 - - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5 -- --else -- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS -- GTK_LIBS=$pkg_cv_GTK_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2 version" >&5 --$as_echo_n "checking for GTK2 version... " >&6; } -- GTK_VER=`$PKG_CONFIG --modversion gtk+-2.0` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5 --$as_echo "$GTK_VER" >&6; } -+ as_fn_error $? "Qt 4 $with_qt4 not found" "$LINENO" 5 - - fi - --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 --$as_echo_n "checking for GTK... " >&6; } -- --if test -n "$GTK_CFLAGS"; then -- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$GTK_LIBS"; then -- pkg_cv_GTK_LIBS="$GTK_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1` -- else -- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GTK_PKG_ERRORS" >&5 -- -- as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5 -- --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5 -- --else -- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS -- GTK_LIBS=$pkg_cv_GTK_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2 version" >&5 --$as_echo_n "checking for GTK2 version... " >&6; } -- GTK_VER=`$PKG_CONFIG --modversion gtk+-2.0` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5 --$as_echo "$GTK_VER" >&6; } -- --fi -- --else -- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS -- GTK_LIBS=$pkg_cv_GTK_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3 version" >&5 --$as_echo_n "checking for GTK3 version... " >&6; } -- GTK_VER=`$PKG_CONFIG --modversion gtk+-3.0` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5 --$as_echo "$GTK_VER" >&6; } -- --fi +- PKG_CHECK_MODULES(GTK, gtk+-3.0, +- [ITW_GTK_CHECK_VERSION([3])], +- [PKG_CHECK_MODULES(GTK, gtk+-2.0, +- [ITW_GTK_CHECK_VERSION([2])], +- [AC_MSG_ERROR([GTK $1 not found])] +- )] +- ) - ;; - *) -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 --$as_echo_n "checking for GTK... " >&6; } -- --if test -n "$GTK_CFLAGS"; then -- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$with_gtk.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-$with_gtk.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$with_gtk.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$GTK_LIBS"; then -- pkg_cv_GTK_LIBS="$GTK_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$with_gtk.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-$with_gtk.0") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$with_gtk.0" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$with_gtk.0" 2>&1` -- else -- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$with_gtk.0" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$GTK_PKG_ERRORS" >&5 -- -- as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5 -- --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5 -- --else -- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS -- GTK_LIBS=$pkg_cv_GTK_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK$with_gtk version" >&5 --$as_echo_n "checking for GTK$with_gtk version... " >&6; } -- GTK_VER=`$PKG_CONFIG --modversion gtk+-$with_gtk.0` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5 --$as_echo "$GTK_VER" >&6; } -- --fi +- PKG_CHECK_MODULES(GTK, gtk+-$1.0, +- [ITW_GTK_CHECK_VERSION([$1])], +- [AC_MSG_ERROR([GTK $1 not found])] +- ) - ;; - esac -- ++ PKG_CHECK_MODULES(QT, QtCore, ++ [ITW_QT_CHECK_VERSION([])], ++ [AC_MSG_ERROR([Qt not found])] ++ ) + ]) - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 + AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES], +@@ -395,20 +382,12 @@ + dnl FIXME: use unstable + AC_REQUIRE([IT_CHECK_PLUGIN]) + if test "x${enable_plugin}" = "xyes" ; then +- AC_ARG_WITH([gtk], +- [AS_HELP_STRING([--with-gtk=[2|3|default]], +- [the GTK+ version to use (default: 3)])], +- [case "$with_gtk" in +- 2|3|default) ;; +- *) AC_MSG_ERROR([invalid GTK version specified]) ;; +- esac], +- [with_gtk=default]) +- ITW_GTK_CHECK([$with_gtk]) ++ ITW_QT_CHECK() + PKG_CHECK_MODULES(GLIB, glib-2.0) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) +- AC_SUBST(GTK_CFLAGS) +- AC_SUBST(GTK_LIBS) ++ AC_SUBST(QT_CFLAGS) ++ AC_SUBST(QT_LIBS) + + PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [ + AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[ diff -Naur a/plugin/icedteanp/IcedTeaNPPlugin.cc b/plugin/icedteanp/IcedTeaNPPlugin.cc ---- a/plugin/icedteanp/IcedTeaNPPlugin.cc 2012-09-09 14:22:15.045528649 +0000 -+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc 2012-09-09 15:15:56.588075879 +0000 +--- a/plugin/icedteanp/IcedTeaNPPlugin.cc 2012-10-09 00:30:11.564668490 +0000 ++++ b/plugin/icedteanp/IcedTeaNPPlugin.cc 2012-10-09 00:30:27.211248205 +0000 @@ -145,7 +145,7 @@ #define PLUGIN_FILE_EXTS "class,jar,zip" #define PLUGIN_MIME_COUNT 1 @@ -456,8 +139,8 @@ diff -Naur a/plugin/icedteanp/IcedTeaNPPlugin.cc b/plugin/icedteanp/IcedTeaNPPlu PLUGIN_DEBUG ("plugin_display_failure_dialog return\n"); } diff -Naur a/plugin/icedteanp/IcedTeaNPPlugin.h b/plugin/icedteanp/IcedTeaNPPlugin.h ---- a/plugin/icedteanp/IcedTeaNPPlugin.h 2012-09-09 14:22:15.045528649 +0000 -+++ b/plugin/icedteanp/IcedTeaNPPlugin.h 2012-09-09 15:16:36.394510823 +0000 +--- a/plugin/icedteanp/IcedTeaNPPlugin.h 2012-10-09 00:30:11.564668490 +0000 ++++ b/plugin/icedteanp/IcedTeaNPPlugin.h 2012-10-09 00:30:27.211248205 +0000 @@ -51,8 +51,8 @@ #include #include diff --git a/kdeplasma-applets-cwp/PKGBUILD b/kdeplasma-applets-cwp/PKGBUILD index bdb57dc67..f42886606 100644 --- a/kdeplasma-applets-cwp/PKGBUILD +++ b/kdeplasma-applets-cwp/PKGBUILD @@ -4,7 +4,7 @@ # maintainer abveritas@chakra-project.org pkgname=kdeplasma-applets-cwp -pkgver=1.6.4 +pkgver=1.6.5 pkgrel=1 pkgdesc="cwp, a kdeplasma weather plasmoid with lots of customization" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ categories=('accessories') screenshot=('http://kde-apps.org/CONTENT/content-pre1/98925-1.png') install=customizable-weather-plasmoid.install source=(http://www.kde-look.org/CONTENT/content-files/98925-cwp-$pkgver.tar.bz2) -md5sums=('107e40ec1c9a00709599b5b655e7ff7c') +md5sums=('f1df50499a377f5c8e1c49fea4a3c286') build() { cd $srcdir/cwp-$pkgver/ diff --git a/merkaartor/PKGBUILD b/merkaartor/PKGBUILD index a8b99233f..7c8192d6a 100644 --- a/merkaartor/PKGBUILD +++ b/merkaartor/PKGBUILD @@ -7,22 +7,23 @@ # Contributor: Brice Maron pkgname=merkaartor -pkgver=0.17.2 -pkgrel=2 +pkgver=0.18.1 +_pkgver=main +pkgrel=1 pkgdesc="An editor for the OpenStreetMap project" arch=('i686' 'x86_64') url="http://www.merkaartor.org/" license=('GPL2') -depends=('exiv2' 'libxml2' 'libxslt' 'proj' 'qt>=4.6') +depends=('exiv2' 'gdal' 'libxml2' 'libxslt' 'proj' 'qt') optdepends=('gpsd') makedepends=('boost') conflicts=('merkaartor-svn') categories=('network' 'education') -source=("http://www.merkaartor.be/attachments/download/253/$pkgname-$pkgver.tar.bz2") -md5sums=('44c49f73efa589a455bb9d3d0a284d09') +source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/$pkgname/main/archive-tarball/$pkgver") +md5sums=('bf4fc33d43f169d7fa3d99ada8c0f1b6') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$_pkgver lrelease ./src/src.pro qmake \ @@ -35,6 +36,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$_pkgver make INSTALL_ROOT=$pkgdir install } diff --git a/nodejs/PKGBUILD b/nodejs/PKGBUILD index 2d16ed336..84b294d29 100644 --- a/nodejs/PKGBUILD +++ b/nodejs/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.8.8 +pkgver=0.8.11 pkgrel=1 pkgdesc="Node.js is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications." arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ depends=('python2' 'openssl') checkdepends=('curl') # curl used for check() options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('f4dae84e96a94b768404c14633bccd49') +md5sums=('23cb6d6a5c3949ac73df3c6b330e834d') build() { cd "node-v${pkgver}" diff --git a/qftp/PKGBUILD b/qftp/PKGBUILD index 0bc5c8af1..b7ac8e64b 100644 --- a/qftp/PKGBUILD +++ b/qftp/PKGBUILD @@ -8,32 +8,37 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=qftp -pkgver=1.3.2 +pkgver=1.4.3 pkgrel=1 -pkgdesc="A QT client for FTP file transfer." +pkgdesc="A Qt client for FTP file transfers." arch=('i686' 'x86_64') url="http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=qftp-qt4&full=1" license=('GPL') depends=('qt') categories=('network') source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/${pkgname}-${pkgver}.tar.gz") -md5sums=('f5d7d9bfc0559748a218446048adca0d') +md5sums=('fc22583f2b5c97f6919bf2600b796cd8') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}" - # Configure and build - ./autogen.sh --prefix=/usr --with-qt-dir=/usr + mkdir -p build + cd build - # Set the right flags... (-Werror is not gonna work!) - find "${srcdir}" -name Makefile -exec sed -i 's~^CXXFLAGS = -Wall -Werror -Wno-non-virtual-dtor$~CXXFLAGS = -Wall -Wno-non-virtual-dtor~g' \{\} \; + # The default LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" specified + # in /etc/makepkg.conf will break the linkage procedure. + unset LDFLAGS + + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/build" + make install DESTDIR="${pkgdir}" } # vim:set ts=2 sw=2 et: diff --git a/rekonq/PKGBUILD b/rekonq/PKGBUILD index 7f836c500..fefb23b71 100644 --- a/rekonq/PKGBUILD +++ b/rekonq/PKGBUILD @@ -4,7 +4,7 @@ # maintainer: abveritas@chakra-project.org pkgname=rekonq -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz 'background.png' 'background.diff' 'searchengine.diff') -md5sums=('3ee3f965b47d790ceacac444fc83f4e4' +md5sums=('97d025df580813013643b8c51675a75d' 'cd493df91e34030a8195eaf8b6d68140' '5d7bab51b8f4b78c0f7cd94c885f22c3' '7ab9dc2e4397a66c7a64e08265171996')