From dee9f17b595ea903a982d31d1124b302bb17e2ff Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Jul 2013 00:58:52 -0700 Subject: Wed Jul 17 00:58:51 PDT 2013 --- extra/dconf/PKGBUILD | 8 ++-- extra/dconf/dconf.install | 10 +++-- extra/git/PKGBUILD | 36 ++++++++++-------- extra/gnome-contacts/PKGBUILD | 6 +-- extra/icedtea-web-java7/PKGBUILD | 9 +++-- extra/icedtea-web-java7/openjdk-hotfix.patch | 56 ++++++++++++++++++++++++++++ extra/live-media/PKGBUILD | 6 +-- extra/rtmpdump/PKGBUILD | 10 ++--- 8 files changed, 103 insertions(+), 38 deletions(-) create mode 100644 extra/icedtea-web-java7/openjdk-hotfix.patch (limited to 'extra') diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index a12c0d2ec..bf4e5a2e9 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183552 2013-04-23 04:49:12Z eric $ +# $Id: PKGBUILD 190798 2013-07-16 21:17:38Z heftig $ # Maintainer: Ionut Biru pkgname=dconf -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) url="http://live.gnome.org/dconf" license=('LGPL2.1') -depends=('glib2' 'gtk-update-icon-cache') +depends=('glib2') makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('192d682b8e160e22506f3fac6847444013c7cdbef188d937a6ae2b357f9134bb') +sha256sums=('a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee') build() { cd "$pkgname-$pkgver" diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 75d713d64..7478c122a 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,13 +1,15 @@ post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + if [[ -x /usr/bin/gtk-update-icon-cache ]]; then gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + fi } post_upgrade(){ - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 347c53a46..de0896e8b 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $ +# $Id: PKGBUILD 190122 2013-07-15 22:43:53Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.3.2 +pkgver=1.8.3.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" license=('GPL2') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') +makedepends=('python2' 'emacs' 'libgnome-keyring') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' @@ -18,10 +18,10 @@ optdepends=('tk: gitk and git gui' 'perl-authen-sasl: git send-email TLS support' 'python2: various helper scripts' 'subversion: git svn' - 'cvsps: git cvsimport') + 'cvsps: git cvsimport' + 'gnome-keyring: GNOME keyring credential helper') replaces=('git-core') provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') install=git.install source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" @@ -37,8 +37,8 @@ build() { NO_CROSS_DIRECTORY_HARDLINKS=1 \ all - cd contrib/emacs - make prefix=/usr + make -C contrib/emacs prefix=/usr + make -C contrib/credential/gnome-keyring } check() { @@ -68,16 +68,23 @@ package() { CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install + INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git # fancy git prompt mkdir -p "$pkgdir"/usr/share/git/ install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh - # more contrib stuff - cp -a ./contrib/* $pkgdir/usr/share/git/ + # emacs + make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install + # gnome credentials helper + install -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring + make -C contrib/credential/gnome-keyring clean + # the rest of the contrib stuff + cp -a ./contrib/* $pkgdir/usr/share/git/ + # scripts are for python 2.x sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ @@ -88,9 +95,6 @@ package() { sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install # how 'bout some manpages? for mansect in man1 man5 man7; do @@ -107,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('83b792fd06066c77e1d4911ebba2d701' - 'f850829e1e7f32e388d2ffb61759fcc9' +md5sums=('63f5355259bae32858dac07326fe4e07' + '99625bedd599c5970e2e3d2d05e8cbc3' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index 11a4eddaa..4a3938f3c 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189930 2013-07-11 18:55:47Z ioni $ +# $Id: PKGBUILD 190124 2013-07-15 23:14:12Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-contacts -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accoun makedepends=('intltool' 'vala' 'gobject-introspection') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6cb3fe9e7f0f2380d77494a3408893265c42ea2a70579f0c871defbab5a7b5fa') +sha256sums=('48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3') build() { cd $pkgname-$pkgver diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index eee6629cf..a28b75be1 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,14 +4,16 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz + openjdk-hotfix.patch) +sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb' + '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -22,6 +24,7 @@ build() { LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz cd "${srcdir}"/icedtea-web* + patch -Np1 < $srcdir/openjdk-hotfix.patch ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} \ diff --git a/extra/icedtea-web-java7/openjdk-hotfix.patch b/extra/icedtea-web-java7/openjdk-hotfix.patch new file mode 100644 index 000000000..29a0a309b --- /dev/null +++ b/extra/icedtea-web-java7/openjdk-hotfix.patch @@ -0,0 +1,56 @@ +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java +--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 +@@ -35,6 +35,8 @@ + import net.sourceforge.jnlp.cache.UpdatePolicy; + import net.sourceforge.jnlp.security.viewer.CertificateViewer; + import net.sourceforge.jnlp.services.ServiceUtil; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + /** + * This is the main entry point for the JNLP client. The main +@@ -113,6 +115,9 @@ + * Launch the JNLP file specified by the command-line arguments. + */ + public static void main(String[] argsIn) { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + args = argsIn; + + if (null != getOption("-viewer")) { +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java +--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 +@@ -234,7 +234,7 @@ + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { +- // ignore it ++ e.printStackTrace(); + } + + doMainAppContextHacks(); +diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java +--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 +@@ -72,6 +72,8 @@ + import java.net.ProxySelector; + import java.util.Enumeration; + import java.util.Properties; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + import net.sourceforge.jnlp.config.DeploymentConfiguration; + import net.sourceforge.jnlp.runtime.JNLPRuntime; +@@ -94,6 +96,9 @@ + */ + public static void main(String args[]) + throws IOException { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { + System.err.println("Invalid pipe names provided. Refusing to proceed."); + System.exit(1); diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 0b5d30a84..47fcadf55 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188257 2013-06-13 16:04:25Z giovanni $ +# $Id: PKGBUILD 190133 2013-07-16 17:49:19Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2013.06.06 +pkgver=2013.07.16 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('81431f6217725e2b1c3f1a16fca19221') +md5sums=('8b660d11d43c3beac11580e62e3179f8') build() { cd ${srcdir}/live diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index d6cc9a070..09d5dbdad 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 189979 2013-07-12 06:44:58Z eric $ +# $Id: PKGBUILD 190126 2013-07-16 03:23:42Z eric $ # Maintainer: # Contributor: xduugu # Contributor: Elis Hughes pkgname=rtmpdump pkgver=20121230 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64') url="http://rtmpdump.mplayerhq.hu/" license=('GPL2' 'LGPL2.1') depends=('openssl') -options=(!makeflags) +options=('!makeflags') #git://git.ffmpeg.org/rtmpdump -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('89faf9df54204dbab211621809aa961ea6405e192cc0ce6633307e87aed400b7') +source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz) +sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2') build() { cd $pkgname-$pkgver -- cgit v1.2.3-54-g00ecf