diff options
28 files changed, 398 insertions, 353 deletions
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 33dbdbb72..ba84645f5 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103349 2014-01-03 20:02:33Z arodseth $ +# $Id: PKGBUILD 103465 2014-01-06 12:41:09Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -9,11 +9,11 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') pkgver=R16B03 -pkgrel=3 +pkgrel=4 arch=('x86_64' 'i686') url='http://www.erlang.org/' license=('custom') -makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9' 'glu') +makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'glu') options=('staticlibs') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz" diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 9d3fbad0a..01aeea0fe 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -17,7 +17,7 @@ source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz folders.diff) sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' 'SKIP' - '805d1130394e3ff18ae7043e111fe2ea045a7da6f290d298a670f9e2c35ba533') + '82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -86,20 +86,21 @@ package_libgphobos-devel() depends=('gdc') # druntime - install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/$pkgver/object.di - cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core - cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc + install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di + install -D $srcdir/gdc/libphobos/libdruntime/__entrypoint.di ${pkgdir}/usr/include/dlang/gdc/__entrypoint.di + cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/core + cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/gcc # workaround for auto-generated libbacktrace issue # script needs to be re-written to first call normal gcc instalaltion targets to # avoid such problems in future - cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/$pkgver/gcc - rm $pkgdir/usr/include/dlang/gdc/$pkgver/gcc/libbacktrace.d.in + cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/ + rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in # phobos - cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d - cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std - cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc + cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/ + cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std + cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a } diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff index cf89e5d3d..625d844b0 100644 --- a/community/gdc/folders.diff +++ b/community/gdc/folders.diff @@ -1,16 +1,34 @@ diff --git a/libphobos/configure.ac b/libphobos/configure.ac -index 69dfc35..89b8136 100644 +index 51d9b86..6ff04f1 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac -@@ -215,9 +215,9 @@ dnl (# Default case for install directory for include files.) and on - # will have to modify gcc/configure.ac .. - # For now, basic workaround for cross compilers .. - if test "${host}" != "${target}"; then +@@ -239,9 +239,9 @@ else + fi + + if test "${gdc_host}" != "${gdc_target}"; then - gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d + gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang else - gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gcc ++ gdc_include_dir='${prefix}'/include/dlang/gdc fi AC_SUBST(gdc_include_dir) AC_ARG_WITH([cross-host], + +diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in +index 17e5c45..8a656b1 100644 +--- a/gcc/d/Make-lang.in ++++ b/gcc/d/Make-lang.in +@@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor + + # This should be configured + ifeq ($(host), $(target)) +- D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version) ++ D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc + gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir) + else +- gcc_d_include_dir = $(libsubdir)/include/d ++ gcc_d_include_dir = $(libsubdir)/include/dlang/gdc + endif + + diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD index eea49c48f..2e56ea5a5 100644 --- a/community/gnome-do/PKGBUILD +++ b/community/gnome-do/PKGBUILD @@ -1,30 +1,23 @@ -# $Id: PKGBUILD 99772 2013-10-30 23:37:16Z allan $ +# $Id: PKGBUILD 103497 2014-01-06 21:06:24Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Doehni <dohny@gmx.de> pkgname=gnome-do -pkgver=0.9 -pkgrel=2 +pkgver=0.95 +pkgrel=1 pkgdesc="Quickly search for many items present on your desktop or the web, and perform useful actions on those items" arch=('i686' 'x86_64') -url="http://do.davebsd.com/" +url="https://launchpad.net/do" license=('GPL3') -depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'libgnome-sharp' 'gio-sharp') +depends=('gconf-sharp' 'gnome-desktop2' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'gkeyfile-sharp' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'gio-sharp') install=$pkgname.install -source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz - gio-gnomedesktop.patch) -md5sums=('d360e56953915d9585c0ee71f433129c' - 'e9ac5e4510c1475d61a20c5d94594d98') +source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('60309cd42dcdfc25e215346b3346095f') build() { cd "$srcdir/$pkgname-$pkgver" - - # https://code.launchpad.net/~ballogy/do/gio-gnomedesktop-port/+merge/95842 - patch -Np1 -i "$srcdir/gio-gnomedesktop.patch" - - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas @@ -33,6 +26,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } diff --git a/community/gnome-do/gio-gnomedesktop.patch b/community/gnome-do/gio-gnomedesktop.patch deleted file mode 100644 index 358b0b731..000000000 --- a/community/gnome-do/gio-gnomedesktop.patch +++ /dev/null @@ -1,252 +0,0 @@ -diff -Naur gnome-do-0.9.orig/configure.ac gnome-do-0.9/configure.ac ---- gnome-do-0.9.orig/configure.ac 2012-03-04 08:46:12.000000000 +0100 -+++ gnome-do-0.9/configure.ac 2012-06-24 19:31:49.150955445 +0200 -@@ -60,17 +60,29 @@ - PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0]) - PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0]) - PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0]) -+ -+dnl gio-sharp is an unstable api library -+PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0]) -+files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`" -+for file in $files; do -+ GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file" -+ GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)" -+ [[ -r "$file.config" ]] && GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file.config" -+ [[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config" -+ -+ GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)" -+done -+AC_SUBST([GIO_SHARP_SOURCE_ASSEMBLIES]) -+AC_SUBST([GIO_SHARP_ASSEMBLIES]) -+AC_SUBST([GIO_SHARP_LIBS]) -+ - PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0]) - PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0]) --PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0]) --PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0]) - PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0]) --PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0]) - PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins]) - PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui]) - PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup]) - PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp]) --PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0]) - - - AC_SUBST([GCONF_SHARP_20_LIBS]) -@@ -78,10 +90,7 @@ - AC_SUBST([GLIB_SHARP_20_LIBS]) - AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS]) - AC_SUBST([GNOME_KEYRING_SHARP_LIBS]) --AC_SUBST([GNOME_SHARP_20_LIBS]) --AC_SUBST([GNOME_VFS_SHARP_20_LIBS]) - AC_SUBST([GTK_SHARP_20_LIBS]) --AC_SUBST([LIBRSVG_SHARP_LIBS]) - AC_SUBST([MONO_ADDINS_LIBS]) - AC_SUBST([MONO_ADDINS_GUI_LIBS]) - AC_SUBST([MONO_ADDINS_SETUP_LIBS]) -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in ---- gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in 2012-06-24 19:31:49.124289904 +0200 -@@ -1,3 +1,4 @@ - <configuration> - <dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/> -+ <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/> - </configuration> -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am gnome-do-0.9/Do.Platform.Linux/Makefile.am ---- gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/Makefile.am 2012-06-24 19:31:49.127623096 +0200 -@@ -27,6 +27,8 @@ - src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \ - src/Do.Universe/ApplicationItem.cs \ - src/Do.Universe/CategoryItem.cs \ -+ src/Do.Universe/Desktop.cs \ -+ src/Do.Universe/DesktopThumbnailSize.cs \ - src/Do.Universe/NullApplicationItem.cs \ - src/Do.Universe/FileItem.cs \ - src/Do.Universe/ApplicationItemSource.cs \ -@@ -54,7 +56,7 @@ - Mono.Posix \ - $(GTK_SHARP_20_LIBS) \ - $(GNOME_KEYRING_SHARP_LIBS) \ -- $(GNOME_SHARP_20_LIBS) \ -+ $(GIO_SHARP_LIBS) \ - $(GNOME_DESKTOP_SHARP_20_LIBS) \ - $(GCONF_SHARP_20_LIBS) \ - $(MONO_ADDINS_LIBS) \ -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs 2012-06-24 19:31:49.130956287 +0200 -@@ -166,7 +166,8 @@ - - string AutoStartUri { - get { -- return Gnome.Vfs.Uri.GetUriFromLocalPath (AutoStartFileName); -+ var uri = new Uri(AutoStartFileName).ToString(); -+ return uri; - } - } - -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs 2012-06-24 19:31:49.134289478 +0200 -@@ -0,0 +1,76 @@ -+// This file was generated by the Gtk# code generator. -+// Any changes made will be lost if regenerated. -+ -+namespace Gnome { -+ -+ using System; -+ using System.Runtime.InteropServices; -+ -+#region Autogenerated code -+ public class Desktop { -+ -+ [DllImport("gnome-desktop-2")] -+ static extern void gnome_desktop_prepend_terminal_to_vector(out int argc, IntPtr argv); -+ -+ public static int PrependTerminalToVector(string argv) { -+ int argc; -+ gnome_desktop_prepend_terminal_to_vector(out argc, GLib.Marshaller.StringToPtrGStrdup(argv)); -+ return argc; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern bool gnome_desktop_thumbnail_has_uri(IntPtr pixbuf, IntPtr uri); -+ -+ public static bool ThumbnailHasUri(Gdk.Pixbuf pixbuf, string uri) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ bool raw_ret = gnome_desktop_thumbnail_has_uri(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri); -+ bool ret = raw_ret; -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern IntPtr gnome_desktop_thumbnail_scale_down_pixbuf(IntPtr pixbuf, int dest_width, int dest_height); -+ -+ public static Gdk.Pixbuf ThumbnailScaleDownPixbuf(Gdk.Pixbuf pixbuf, int dest_width, int dest_height) { -+ IntPtr raw_ret = gnome_desktop_thumbnail_scale_down_pixbuf(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, dest_width, dest_height); -+ Gdk.Pixbuf ret = GLib.Object.GetObject(raw_ret) as Gdk.Pixbuf; -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern IntPtr gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size); -+ -+ public static string ThumbnailPathForUri(string uri, Gnome.DesktopThumbnailSize size) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ IntPtr raw_ret = gnome_desktop_thumbnail_path_for_uri(native_uri, (int) size); -+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern bool gnome_desktop_thumbnail_is_valid(IntPtr pixbuf, IntPtr uri, IntPtr mtime); -+ -+ public static bool ThumbnailIsValid(Gdk.Pixbuf pixbuf, string uri, System.DateTime mtime) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ bool raw_ret = gnome_desktop_thumbnail_is_valid(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri, GLib.Marshaller.DateTimeTotime_t (mtime)); -+ bool ret = raw_ret; -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern IntPtr gnome_desktop_thumbnail_md5(IntPtr uri); -+ -+ public static string ThumbnailMd5(string uri) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ IntPtr raw_ret = gnome_desktop_thumbnail_md5(native_uri); -+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+#endregion -+ } -+} -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs 2012-06-24 19:31:49.137622670 +0200 -@@ -0,0 +1,16 @@ -+// This file was generated by the Gtk# code generator. -+// Any changes made will be lost if regenerated. -+ -+namespace Gnome { -+ -+ using System; -+ using System.Runtime.InteropServices; -+ -+#region Autogenerated code -+ public enum DesktopThumbnailSize { -+ -+ Normal, -+ Large, -+ } -+#endregion -+} -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs 2012-06-24 19:31:49.140955864 +0200 -@@ -63,8 +63,6 @@ - - static FileItem () - { -- Gnome.Vfs.Vfs.Initialize (); -- - // Initialize SpecialFolderIcons by expanding paths in - // SpecialFolderIconsXDG. - // -@@ -130,7 +128,11 @@ - } - - public string MimeType { -- get { return Gnome.Vfs.Global.GetMimeType (Path); } -+ get { -+ GLib.File file = GLib.FileFactory.NewFromCommandlineArg(Path); -+ var info = file.QueryInfo ("standard::content-type", GLib.FileQueryInfoFlags.None, null); -+ return info.ContentType; -+ } - } - - public override string Icon { -@@ -142,8 +144,8 @@ - icon = MaybeGetSpecialFolderIconForPath (Path); - if (icon != null) return icon; - -- string large_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Large); -- string normal_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Normal); -+ string large_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Large); -+ string normal_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Normal); - - // Generating the thumbnail ourself is too slow for large files. - // Suggestion: generate thumbnails asynchronously. Banshee's -diff -Naur gnome-do-0.9.orig/Makefile.am gnome-do-0.9/Makefile.am ---- gnome-do-0.9.orig/Makefile.am 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Makefile.am 2012-06-24 19:31:56.837297364 +0200 -@@ -2,6 +2,22 @@ - - ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock - -+# Install copied assemblies to our libdir -+copiedlibsdir = $(pkglibdir) -+copiedlibs_DATA = \ -+ $(GIO_SHARP_ASSEMBLIES) -+ -+$(GIO_SHARP_ASSEMBLIES): $(GIO_SHARP_SOURCE_ASSEMBLIES) -+ @mkdir -p $(top_builddir)/build -+ @for file in $@ ; do \ -+ for source in $? ; do \ -+ if [ $$(basename $$source) == $$(basename $$file) ] ; then \ -+ echo " CP " $$(basename $$file) ; \ -+ cp $$source $$file ; \ -+ fi ;\ -+ done ; \ -+ done -+ - SUBDIRS = \ - . \ - data \ diff --git a/community/pacparser/PKGBUILD b/community/pacparser/PKGBUILD new file mode 100644 index 000000000..f7c000918 --- /dev/null +++ b/community/pacparser/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 103445 2014-01-06 02:45:23Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Max Meyer <dev@fedux.org> + +pkgbase=pacparser +pkgname=('pacparser' 'python2-pacparser') +pkgver=1.3.1 +pkgrel=1 +arch=(i686 x86_64) +url="http://pacparser.googlecode.com" +license=('LGPL') +makedepends=('python2') +options=('!makeflags') +source=("http://pacparser.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz") + +build() { + cd $pkgbase-$pkgver + PYTHON=python2 make all pymod -C src +} + +package_pacparser() { + pkgdesc="Library to parse proxy auto-config (PAC) files" + + cd $pkgbase-$pkgver + make -C src DESTDIR="$pkgdir/" install +} + +package_python2-pacparser() { + depends=('python2') + pkgdesc="Python 2.x pacparser module" + + cd $pkgbase-$pkgver + PYTHON=python2 make -C src DESTDIR="$pkgdir/" install-pymod +} + +# vim:set ts=2 sw=2 et: +sha512sums=('20295667d92eb5385429c085c14ca8dc1ba216487ff474304433f99119216934be2dd1647452173418de31f5345679dd7159eafd331e40a2b87564f878d31349') diff --git a/community/ponymix/PKGBUILD b/community/ponymix/PKGBUILD new file mode 100644 index 000000000..49f988710 --- /dev/null +++ b/community/ponymix/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Dave Reisner <d@falconindy.com> +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +pkgname=ponymix +pkgver=2 +pkgrel=2 +pkgdesc="CLI PulseAudio Volume Control" +arch=('i686' 'x86_64') +url="http://github.com/falconindy/ponymix" +license=('MIT') +depends=('pulseaudio' 'libnotify') +source=("http://code.falconindy.com/archive/ponymix/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('9874c22dbba2805c870ae663331ca4ca' + 'SKIP') + +build() { + make -C "$srcdir/$pkgname-$pkgver" +} + +package() { + make -C "$srcdir/$pkgname-$pkgver" DESTDIR="$pkgdir" install +} + +# vim: ft=sh syn=sh et diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD index cc563b77a..a2fe30c1f 100644 --- a/community/python-cx_freeze/PKGBUILD +++ b/community/python-cx_freeze/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84904 2013-02-25 23:57:50Z arodseth $ +# $Id: PKGBUILD 103463 2014-01-06 11:40:32Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -7,7 +7,7 @@ pkgbase=python-cx_freeze pkgname=('python-cx_freeze' 'python2-cx_freeze') -pkgver=4.3.1 +pkgver=4.3.2 pkgrel=1 pkgdesc='Set of utilities for freezing Python scripts into executables' arch=('x86_64' 'i686') @@ -15,13 +15,13 @@ url='http://cx-freeze.sourceforge.net/' license=('PSF') makedepends=('python' 'python2') source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz") -sha256sums=('11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b') +sha256sums=('d634aae1e1d20b660d24245450b8a5ea3ad9c443cd735d8fbe17c1d93b8b23df') package_python-cx_freeze() { depends=('python') conflicts=('cx_freeze' 'python2-cx_freeze') - cd "$srcdir/cx_Freeze-$pkgver" + cd "cx_Freeze-$pkgver" python setup.py install --root "$pkgdir" --optimize 1 } @@ -30,8 +30,9 @@ package_python2-cx_freeze() { conflicts=('cx_freeze' 'python-cx_freeze') replaces=('cx_freeze') - cd "$srcdir/cx_Freeze-$pkgver" + cd "cx_Freeze-$pkgver" python2 setup.py install --root "$pkgdir" --optimize 1 + # Python 2 shebang fix find "$pkgdir" -name qotd.py -exec sed -i '0,/on/s//on2/' {} \; } diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 0a0edc18d..14bec946f 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 95829 2013-08-17 12:17:24Z bgyorgy $ +# $Id: PKGBUILD 103501 2014-01-06 21:19:08Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.10.3 -pkgrel=2 +pkgver=1.10.4 +pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64') -url="http://urlget.sourceforge.net/" +url="http://ugetdm.com/" license=('LGPL') depends=('libnotify' 'gtk3' 'gstreamer' 'curl' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) -md5sums=('d71c927cfcfc3ef9f62cc9cb3ca7bab7') +md5sums=('58139de0bd043cfeae0f22c239f4bbc5') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-appindicator make @@ -25,6 +24,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 2de510c5d..d743e3091 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185263 2013-05-12 16:29:01Z dan $ +# $Id: PKGBUILD 203228 2014-01-05 23:07:05Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.15 -pkgrel=2 +pkgver=1.4.17 +pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64) url="http://memcached.org/" @@ -12,10 +12,10 @@ license=('GPL') depends=('libevent') optdepends=('perl: for memcached-tool usage') install=memcached.install -source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz +source=(http://www.memcached.org/files/$pkgname-$pkgver.tar.gz memcached.service) -sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4' - '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6') +sha256sums=('d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458' + 'e768a48192aefa2e2f443c86b3c085043005ffc313da40f3074c060a18c8359d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,6 +23,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make test +} + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/extra/memcached/memcached.service b/extra/memcached/memcached.service index c6e15fb7c..8b04b1c35 100644 --- a/extra/memcached/memcached.service +++ b/extra/memcached/memcached.service @@ -6,6 +6,7 @@ After=network.target User=memcached # Remove '-l 127.0.0.1' to listen on all addresses ExecStart=/usr/bin/memcached -l 127.0.0.1 +Restart=always [Install] WantedBy=multi-user.target diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 41a5b7b8f..8a4a1aa92 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200687 2013-12-02 16:02:10Z giovanni $ +# $Id: PKGBUILD 203249 2014-01-06 19:40:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('bede5869f9b5d09ab3269bac472495e7' +md5sums=('050d05f9efc95dfef88217b63962a09a' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index d83c26897..12b858267 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,20 +1,29 @@ -# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $ +# $Id: PKGBUILD 203236 2014-01-06 07:56:25Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') pkgver=10.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') url="http://mesa3d.sourceforge.net" license=('custom') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE) + LICENSE + revert.remove.GLXContextID.typedef.patch) md5sums=('0a72ca5b36046a658bf6038326ff32ed' - '5c65a0fe315dd347e09b1f2826a1df5a') + '5c65a0fe315dd347e09b1f2826a1df5a' + '6e49b4dd4ceb7873610f608f74efbaaf') + +prepare() { + cd ${srcdir}/?esa-* + + # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392) + patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch +} build() { cd ${srcdir}/?esa-* diff --git a/extra/mesa/revert.remove.GLXContextID.typedef.patch b/extra/mesa/revert.remove.GLXContextID.typedef.patch new file mode 100644 index 000000000..92232dd2d --- /dev/null +++ b/extra/mesa/revert.remove.GLXContextID.typedef.patch @@ -0,0 +1,30 @@ +From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001 +From: Kenneth Graunke <kenneth@whitecape.org> +Date: Mon, 30 Dec 2013 07:19:36 +0000 +Subject: Revert "mesa: Remove GLXContextID typedef from glx.h." + +This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. + +According to belak51 on IRC, this commit broke Allegro, which would no +longer compile. Applications apparently expect the GLXContextID typedef +to exist in glx.h; removing it breaks them. A bit of searching around +the internet revealed other complaints since upgrading to Mesa 10. + +Cc: "10.0" <mesa-stable@lists.freedesktop.org> +(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33) +--- +diff --git a/include/GL/glx.h b/include/GL/glx.h +index 62d0ede..234abc0 100644 +--- a/include/GL/glx.h ++++ b/include/GL/glx.h +@@ -168,6 +168,7 @@ typedef XID GLXDrawable; + /* GLX 1.3 and later */ + typedef struct __GLXFBConfigRec *GLXFBConfig; + typedef XID GLXFBConfigID; ++typedef XID GLXContextID; + typedef XID GLXWindow; + typedef XID GLXPbuffer; + +-- +cgit v0.9.0.2-2-gbebe + diff --git a/extra/xorg-server/CVE-2013-6424.diff b/extra/xorg-server/CVE-2013-6424.diff new file mode 100644 index 000000000..8c664b66e --- /dev/null +++ b/extra/xorg-server/CVE-2013-6424.diff @@ -0,0 +1,49 @@ +From patchwork Wed Oct 2 13:47:54 2013 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: exa: only draw valid trapezoids +From: Maarten Lankhorst <maarten.lankhorst@canonical.com> +X-Patchwork-Id: 14769 +Message-Id: <524C240A.9010607@canonical.com> +To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org> +Date: Wed, 02 Oct 2013 15:47:54 +0200 + +Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484 + +If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly. +A similar fix should also be applied to pixman. + +Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> + +--- + + +diff --git a/exa/exa_render.c b/exa/exa_render.c +index 172e2b5..807eeba 100644 +--- a/exa/exa_render.c ++++ b/exa/exa_render.c +@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, + + exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); + for (; ntrap; ntrap--, traps++) +- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); ++ if (xTrapezoidValid(traps)) ++ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); + exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); + + xRel = bounds.x1 + xSrc - xDst; +diff --git a/render/picture.h b/render/picture.h +index c85353a..fcd6401 100644 +--- a/render/picture.h ++++ b/render/picture.h +@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed; + /* whether 't' is a well defined not obviously empty trapezoid */ + #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ + (t)->right.p1.y != (t)->right.p2.y && \ +- (int) ((t)->bottom - (t)->top) > 0) ++ ((t)->bottom > (t)->top)) + + /* + * Standard NTSC luminance conversions: + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 28ade7a63..b9b3f52ad 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201503 2013-12-13 14:16:21Z andyrtr $ +# $Id: PKGBUILD 203261 2014-01-06 22:20:54Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.14.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -22,7 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf - fb-rename-wfbDestroyGlyphCache.patch) + fb-rename-wfbDestroyGlyphCache.patch + CVE-2013-6424.diff) sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' @@ -32,7 +33,8 @@ sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') + 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1' + '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61') prepare() { cd "${pkgbase}-${pkgver}" @@ -53,6 +55,9 @@ prepare() { # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch + + # Fix CVE-2013-6424 (FS#38401) + patch -Np1 -i ../CVE-2013-6424.diff } build() { diff --git a/kernels/pax-flags-libre/PKGBUILD b/kernels/pax-flags-libre/PKGBUILD index b36d6fa20..7ae862232 100644 --- a/kernels/pax-flags-libre/PKGBUILD +++ b/kernels/pax-flags-libre/PKGBUILD @@ -7,9 +7,9 @@ # pkgname=pax-flags-libre -pkgdesc='Deactivates PaX flags for several binaries to work with PaX enabled kernels, without nonfree software support' -pkgver=2.0.14 -pkgrel=2 +pkgdesc='Deactivates PaX flags for several binaries to work with PaX enabled kernels (a libre fork of linux-pax-flags)' +pkgver=2.0.15 +pkgrel=1 arch=(any) url='https://github.com/g4jc/pax-flags-libre' license=(GPL3) @@ -36,16 +36,16 @@ package() { mkdir -p $pkgdir/etc/pax-flags } -sha256sums=('8581506830903ffcbb0876e4380d660ff044d9805d68f1432753c5bb99dc0db9' +sha256sums=('06295e9d2afea0ea01c42620f0cd5e3ae785bc42c2749d4bef52f7d5b8a043ce' 'ee66dc1087f501a7ebb89b0ec36125b94dc87ce560aa38c6d606dad1818d5b95' '9d62896dd51be4979cd85bfcd09de219f6068ec312f27e2a66f7a2f2c78d1f38' '7bbbad18a19150893916995723cd7e256a7b4e2baa5c2ff57bc27886c40f51fc' 'bb87f4dce8e20f2ce601bdcb888dd688d8f0e9d0ab367e09c8081daffa15b03a' - '298bf32f4e8193d4cc5a4eb98369dc564afe51849046fd5673150cea51950985' + '9982ffa4d1dffc979ec7347dfcf3a558e6f441a45c07a2d7a3c3159e02bc4763' '71afe786955d149fe216ff1a60348562914a6820d3b7f9dc42aa44913062b04e' '01ddeec77c605e1d3aa00a1fdc4c3537989468ab78da5f37b893cdbcfe34176c' '1f205fddfb427a696fb00221a3007453e25fbbf180ea026c264d23eeac9e1870' '2736d0ef20d0127c34e132db38d8993dee3062ba0ac0cdf8d444a8d3665698b8' '6171eefd363f2c70bed9ac41fae3458d9e03460fdaf079c99445482e9649555a' - '5cd70e01fc7c8867d3ee9160fecf44c028947b54788a41833789c71ef5cef9a4' + '1271e807fa70a9af8659a8e982830cdb2ab20982a44a967fa2c973ebc7f54664' 'ea003c4201745cd0c4bcf5cec5ca2d0a79cc6b1b04ceaa276ace0ad0287b8c50') diff --git a/kernels/pax-flags-libre/games.conf b/kernels/pax-flags-libre/games.conf index 9b5bd943a..5552b2814 100644 --- a/kernels/pax-flags-libre/games.conf +++ b/kernels/pax-flags-libre/games.conf @@ -12,4 +12,7 @@ PSmXER: - /opt/enemy-territory/et.x86 - /opt/quake3/ioquake3.i386 - /opt/quake3/ioquake3.x86_64 + - /usr/bin/bzflag + - /usr/bin/minetest + - /usr/bin/opencity diff --git a/kernels/pax-flags-libre/pax-flags-libre.sh b/kernels/pax-flags-libre/pax-flags-libre.sh index 612f6cf93..97b45cc87 100755 --- a/kernels/pax-flags-libre/pax-flags-libre.sh +++ b/kernels/pax-flags-libre/pax-flags-libre.sh @@ -10,4 +10,4 @@ ruby=$(which ruby) $sudo systemctl --system daemon-reload -$sudo linux-pax-flags.rb $@ +$sudo pax-flags-libre.rb $@ diff --git a/kernels/pax-flags-libre/simple.conf b/kernels/pax-flags-libre/simple.conf index d4d6594a8..ff726e430 100644 --- a/kernels/pax-flags-libre/simple.conf +++ b/kernels/pax-flags-libre/simple.conf @@ -11,6 +11,7 @@ PSmXEr: - /usr/lib/iceweasel/plugin-container - /usr/lib/gcc/x86_64-unknown-linux-gnu/*/cc1plus - /usr/lib/icedove/icedove + - /usr/bin/qupzilla # MPROTECT off PSmXER: @@ -48,6 +49,7 @@ PSmXER: - /usr/lib/xbmc/xbmc.bin - /usr/sbin/grub-probe - /usr/sbin/vbetool + - /usr/bin/midori # PAGEEXEC, MPROTECT, EMUTRAMP and RANDMMAP off pSmXer: diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 064900004..88d428815 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198672 2013-11-01 21:09:24Z bisson $ +# $Id: PKGBUILD 203196 2014-01-05 05:25:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -8,7 +8,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' @@ -61,7 +61,7 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a9e831f4fd4d4c4a1dab11b819fa5ac96ce9fad0') +sha1sums=('bcccd4304692a62d1b7963322f64059a0fb9532a') prepare() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 569706f80..7daf4c071 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20131112 -_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0 -_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390 +pkgver=20140106.1 +_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651 +_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -64,8 +64,8 @@ package_libretools() { depends=( "librelib=$pkgver" + "gitget=$pkgver" # `createworkdir` arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` @@ -87,5 +87,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('81e6d3d6fe1964a407a4520ce0916c0d' - '656008e8e35e6adba527b7bfc367b9f7') +md5sums=('246274cf5974d6adee536edbdb2447c0' + 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index d46990da8..a451add36 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,14 +1,49 @@ #!/bin/sh -_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' +_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'" +_edit_cmnt='#%s # commented out by the libretools post_install script' + +_add_cmnt='# The following line is added by the libretools post_install script' +_add_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' + +# This line was installed by previous versions of this script +_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + +# has_line $line +has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } +# add_line $line +add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; } +# del_line $line +del_line() { + local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) + if [[ "${#lineno[@]}" -gt 0 ]]; then + sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf; + fi +} +# rep_line $orig $replacement_bre +rep_line() { + local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) + if [[ "${#lineno[@]}" == 1 ]]; then + sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf; + fi +} # arg 1: the new package version post_install() { - if grep -q 'libre::' etc/makepkg.conf; then + if grep -q 'librefetch' etc/makepkg.conf; then libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + if has_line "$_old_code"; then + libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf" + del_line "$_old_code" + post_install + else + return 0 + fi else - libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" - printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" + rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" + add_line "$_add_cmnt" + add_line "$_add_code" fi } @@ -19,10 +54,11 @@ post_upgrade() { } pre_remove() { - if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - sed -i '/libre::/d' etc/makepkg.conf - else - libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" - fi + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + + rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code" + del_line "$_add_cmnt" + del_line "$_add_code" + + del_line "$_old_code" } diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 232805e89..d97f31df7 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre pkgver=10.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net license=(MIT Khronos LGPL) @@ -26,8 +26,21 @@ makedepends=( provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) -source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 -sha512sums=7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1 +source=( + ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 + revert.remove.GLXContextID.typedef.patch +) +sha512sums=( + 7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1 + a2a92d997e1615548371ef618daf47011c7fc71d51d31dbdf47a54d56e078f98af624bde5cd7779c3d8ffb60f3b64aa8ebb5d6363cad261e52605926b47d7a35 +) + +prepare() { + cd $srcdir/${pkgbase^}-$pkgver + + # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392) + patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch +} build() { cd $srcdir/${pkgbase^}-$pkgver diff --git a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch new file mode 100644 index 000000000..92232dd2d --- /dev/null +++ b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch @@ -0,0 +1,30 @@ +From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001 +From: Kenneth Graunke <kenneth@whitecape.org> +Date: Mon, 30 Dec 2013 07:19:36 +0000 +Subject: Revert "mesa: Remove GLXContextID typedef from glx.h." + +This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. + +According to belak51 on IRC, this commit broke Allegro, which would no +longer compile. Applications apparently expect the GLXContextID typedef +to exist in glx.h; removing it breaks them. A bit of searching around +the internet revealed other complaints since upgrading to Mesa 10. + +Cc: "10.0" <mesa-stable@lists.freedesktop.org> +(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33) +--- +diff --git a/include/GL/glx.h b/include/GL/glx.h +index 62d0ede..234abc0 100644 +--- a/include/GL/glx.h ++++ b/include/GL/glx.h +@@ -168,6 +168,7 @@ typedef XID GLXDrawable; + /* GLX 1.3 and later */ + typedef struct __GLXFBConfigRec *GLXFBConfig; + typedef XID GLXFBConfigID; ++typedef XID GLXContextID; + typedef XID GLXWindow; + typedef XID GLXPbuffer; + +-- +cgit v0.9.0.2-2-gbebe + diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD index d3b64fd8e..dda93c171 100644 --- a/libre/reflector/PKGBUILD +++ b/libre/reflector/PKGBUILD @@ -1,25 +1,26 @@ #Maintainer: Xyne <ac xunilhcra enyx, backwards> #Maintainer (Parabola): André Silva <emulatorman@parabola.nu> pkgname=reflector -pkgver=2013.12.15.1 -pkgrel=1 +pkgver=2014 +pkgrel=2 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)' arch=(any) license=(GPL) url="http://xyne.archlinux.ca/projects/reflector" depends=(python3) +optdepends=('rsync: rate rsync mirrors') source=( - http://xyne.archlinux.ca/projects/reflector/src/reflector-2013.12.15.1.tar.xz - http://xyne.archlinux.ca/projects/reflector/src/reflector-2013.12.15.1.tar.xz.sig + http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz + http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz.sig rebranding.patch ) sha512sums=( - ac8a23fb6746d85ee4e4d707659da07f5a7b6c18cadba03c8b03430cae70f444e6b35404342da2f9c0ea490e8c4c0f408657880de00a57d9f94d4ab335aa7c55 + ac9e0026019048c96be5dd4d156bf79b7d7616f764b5d8fb169cb09cbf629a3e2b1efb1ee7cb53b4e0cd109b985f598d9f80941714e47ed0f21c6417df9b073b SKIP 83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02 ) md5sums=( - ccb315013442b7c8aa42c1d017835d38 + 69ab92b948ffe842189229d09bfbf1c0 SKIP 24c2a21bc1ac0d3758d8043f36d95add ) diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 7ca493453..7beeb5918 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2014.01.03 +pkgver=2014.01.05.6 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('676179e05b8c83d63e5aa21a92faaa32' +md5sums=('f3c0d49ace716b01079f96abd962c763' 'SKIP') diff --git a/~lukeshu/dunst-lukeshu-git/PKGBUILD b/~lukeshu/dunst-lukeshu-git/PKGBUILD new file mode 100644 index 000000000..31037e113 --- /dev/null +++ b/~lukeshu/dunst-lukeshu-git/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $ +# Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: feuri + +_pkgname=dunst +_pkgver=1.0.0 +conflicts=("$_pkgname") + +pkgname=$_pkgname-lukeshu-git +pkgver=20130918 +_gitver='commit=67b259b98ac1895bf47c877f216307a174deeb3d' +pkgrel=1 +pkgdesc="A dmenu-ish notification system" +arch=('i686' 'x86_64') +url="http://www.knopwob.org/dunst/" +license=(BSD3) +depends=(libxinerama libxss libxdg-basedir pango) +optdepends=("libnotify: notify-send" + "dbus: start dunst on demand") +makedepends=(libnotify dbus perl) +provides=(notification-daemon "$_pkgname=$_pkgver") + +source=("https://repo.parabolagnulinux.org/other/~lukeshu/$pkgname/$pkgname-$pkgver.tar.gz") +mksource=("$pkgname-$pkgver::git://github.com/LukeShu/dunst.git#${_gitver}") +mkmd5sums=('SKIP') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" PREFIX=/usr install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm755 dunstify "${pkgdir}/usr/bin/dunstify" + cp docs/* "${pkgdir}/usr/share/dunst/" +} + +md5sums=('720b643b2c7a710fabcc7dc1953318bf') |