diff options
47 files changed, 991 insertions, 192 deletions
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 2da9f9d7e..cc3611ace 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99713 2013-10-30 23:11:42Z allan $ +# $Id: PKGBUILD 104636 2014-01-23 16:30:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') @@ -10,8 +10,8 @@ url="http://clanlib.org/" license=('zlib') depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl') makedepends=('doxygen' 'graphviz' 'mesa') -source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz) -md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3') +source=(http://www.clanlib.org/download/releases-3.0/ClanLib-${pkgver}.tgz) +md5sums=('29f2ce542019c6d5d8793cdf4811e4f9') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index 210ce954f..3efb0ea56 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,31 +1,51 @@ -# $Id: PKGBUILD 92890 2013-06-18 08:47:35Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 104578 2014-01-23 04:23:17Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Alexander Fehr <pizzapunk gmail com> -pkgname=galculator +pkgbase=galculator +pkgname=(galculator galculator-gtk2) pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64') url='http://galculator.sourceforge.net/' license=('GPL') -depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') +depends=('gtk3' 'gtk2') makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b') build() { + # GTK3 version + cd $pkgname-$pkgver + [ -e gtk3 ] || mkdir gtk3 + cd gtk3 + ../configure --prefix=/usr + make + + # GTK2 version cd $srcdir/$pkgname-$pkgver - - LDFLAGS+=' -lm' - ./configure --prefix=/usr + [ -e gtk2 ] || mkdir gtk2 + cd gtk2 + ../configure --prefix=/usr --disable-gtk3 make } -package() { - cd $srcdir/$pkgname-$pkgver +package_galculator() { + depends=('gtk3') + + cd $pkgbase-$pkgver/gtk3 + make DESTDIR="$pkgdir" install +} + +package_galculator-gtk2() { + pkgdesc+=' (GTK2 version)' + depends=('gtk2') + conflicts=('galculator') + cd $pkgbase-$pkgver/gtk2 make DESTDIR="$pkgdir" install } diff --git a/community/galculator/galculator.install b/community/galculator/galculator.install index fe845ffb1..1a05f573e 100644 --- a/community/galculator/galculator.install +++ b/community/galculator/galculator.install @@ -1,11 +1,11 @@ post_install() { - update-desktop-database -q - [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { post_install } + post_remove() { post_install } diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index 7884b01a8..8ed1666a7 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99648 2013-10-30 17:30:37Z mtorromeo $ +# $Id: PKGBUILD 104634 2014-01-23 14:58:20Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.4.1 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') license=('BSD') @@ -18,7 +18,7 @@ source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + CFLAGS="$CFLAGS -std=gnu11" ./configure --prefix=/usr make } @@ -30,4 +30,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('7341953fe9f21342b005b6c7e798631678ae713293a64d5fa61dea7449fc10fb') +sha256sums=('5b13dbef27c46e9efbe19b5eef574e298409ed9dbbde85ec805e29d04c05e473') diff --git a/community/liblogging/PKGBUILD b/community/liblogging/PKGBUILD new file mode 100644 index 000000000..e6f747d2c --- /dev/null +++ b/community/liblogging/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 104586 2014-01-23 09:47:05Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Denis Wernert <deniswernert@gmail.com> + +pkgname=liblogging +pkgver=1.0.0pre +pkgrel=1 +pkgdesc="easy to use, portable, open source library for system logging" +url="http://www.liblogging.org/" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('git') +options=('strip' 'zipman' '!libtool') +#source=("http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz") +source=("git://git.adiscon.com/git/liblogging.git") +md5sums=('SKIP') + +build() { + cd ${srcdir}/${pkgname} + + libtoolize --force --copy + aclocal + autoheader + automake --add-missing --copy + autoconf + + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname} + make install DESTDIR=${pkgdir} +} diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 1815ec67f..0db157114 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92941 2013-06-19 21:09:46Z bpiotrowski $ +# $Id: PKGBUILD 104604 2014-01-23 13:18:25Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.3.1 -pkgrel=3 +pkgrel=4 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' @@ -17,17 +17,17 @@ install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) -sha256sums=('7a2a81cd0f2da6b6780bdd47e5f902c9dfaeb8107d763ea63007b6fcdcb4d23b') +sha256sums=('c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722') build() { - cd "${srcdir}" + cd "${srcdir}/luminance-hdr-${pkgver}" cmake -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}" + cd "${srcdir}/luminance-hdr-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index ab6898db8..c2fcea924 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2014-01-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.1-4 libraw rebuild + 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * luminancehdr 2.3.1-3 libraw rebuild diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD index ce73fca29..9822a7cf2 100644 --- a/community/nomacs/PKGBUILD +++ b/community/nomacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102808 2013-12-20 19:30:50Z speps $ +# $Id: PKGBUILD 104605 2014-01-23 13:18:26Z andrea $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=nomacs pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt image viewer" arch=(i686 x86_64) url="http://www.nomacs.org/" diff --git a/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch new file mode 100644 index 000000000..591b2f20d --- /dev/null +++ b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch @@ -0,0 +1,26 @@ +From 05ba23be296085313abd8d7d5075d962084f5d38 Mon Sep 17 00:00:00 2001 +From: Alexandre Franke <alexandre.franke@gmail.com> +Date: Wed, 14 Mar 2012 10:52:25 +0000 +Subject: Better use of fields in the .desktop file + +https://bugzilla.gnome.org/show_bug.cgi?id=672033 +--- +diff --git a/data/planner.desktop.in.in b/data/planner.desktop.in.in +index af61d34..30eb921 100644 +--- a/data/planner.desktop.in.in ++++ b/data/planner.desktop.in.in +@@ -1,6 +1,10 @@ + [Desktop Entry] +-_Name=Project Management +-_Comment=Planner Project Management ++Version=1.0 ++_Name=Planner ++_GenericName=Project Management ++_X-GNOME-FullName=Planner Project Management ++_Comment=Handle the tasks, resources, and cost of your projects ++_Keywords=Gantt;Chart;Critical path;Relationship;Dependency;WBS; + Exec=planner %F + Icon=gnome-planner.png + Terminal=false +-- +cgit v0.9.2 diff --git a/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch new file mode 100644 index 000000000..de5a64c37 --- /dev/null +++ b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch @@ -0,0 +1,41 @@ +From 0cc65e2f420af45f78d190ac2af64810a148bb31 Mon Sep 17 00:00:00 2001 +From: Luis Menina <liberforce@freeside.fr> +Date: Mon, 11 Mar 2013 00:00:44 +0000 +Subject: Don't crash on an empty print preview, just provide an empty preview. + +https://bugzilla.gnome.org/show_bug.cgi?id=581282 +--- +diff --git a/src/planner-print-job.c b/src/planner-print-job.c +index 6334037..96267a0 100644 +--- a/src/planner-print-job.c ++++ b/src/planner-print-job.c +@@ -237,17 +237,7 @@ print_job_draw_page (GtkPrintOperation *operation, + + l = priv->views; + +- /* Abort if there is nothing to print. +- * +- * A better solution would be to set the number of pages to print to 0 +- * in print_job_begin_print, but 0 is not a valid value for +- * gtk_print_operation_set_n_pages. +- */ +- if(!l) { +- return; +- } +- +- while (!page_found) { ++ while (! page_found && l != NULL) { + v = PLANNER_VIEW (l->data); + + pages_in_view = planner_view_print_get_n_pages (v); +@@ -258,8 +248,6 @@ print_job_draw_page (GtkPrintOperation *operation, + } else { + page_nr -= pages_in_view; + l = l->next; +- +- g_assert (l != NULL); + } + } + } +-- +cgit v0.9.2 diff --git a/community/planner/PKGBUILD b/community/planner/PKGBUILD new file mode 100644 index 000000000..5aef75dd1 --- /dev/null +++ b/community/planner/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 104580 2014-01-23 07:08:15Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: herb <herb@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=planner +pkgver=0.14.6 +pkgrel=3 +pkgdesc='Project management application for GNOME' +arch=('i686' 'x86_64') +license=('GPL') +url='https://wiki.gnome.org/Apps/Planner' +depends=('libgnomecanvas' 'libxslt' 'gconf' 'desktop-file-utils') +makedepends=('intltool' 'gtk-doc' 'pygtk') +options=('!emptydirs') +install=planner.install +source=(http://ftp.gnome.org/pub/GNOME/sources/planner/${pkgver%.*}/planner-$pkgver.tar.xz + f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch + 05ba23be296085313abd8d7d5075d962084f5d38.patch + 0cc65e2f420af45f78d190ac2af64810a148bb31.patch + cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch + fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch) +sha256sums=('130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696' + 'bc4455b318bb26f44fe50a8e07292b7654c795ff2a1629a788ea749f6c8bac81' + '88a34bb93bca4ae5865f6c70d7d73f3a0009e5137ba2346a8446c6e206e51b20' + '0cde21948f01baaa31a9a5f8af76444c7151ad39a0bc45d8e04de8b07837f0ad' + '1644550a9be35253fe0a353fc004bd8576de3b85a6b21b92cbb0a87c03f37894' + '4275689c2d4493ddcda3a40309a6bbdcdf6323bed80ca2e011138cdcd88da852') + +prepare() { + cd $pkgname-$pkgver + # Upstream fixes + patch -Np1 -i ../f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch + patch -Np1 -i ../05ba23be296085313abd8d7d5075d962084f5d38.patch + patch -Np1 -i ../0cc65e2f420af45f78d190ac2af64810a148bb31.patch + + # Remove deprecated libgnomeui dependency + patch -Np1 -i ../cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch + patch -Np1 -i ../fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch +} + +build() { + cd $pkgname-$pkgver + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-update-mimedb --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch new file mode 100644 index 000000000..722c59ec3 --- /dev/null +++ b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch @@ -0,0 +1,147 @@ +From cd2b658e83d47e8f49d1bbaf54be6433a21d3758 Mon Sep 17 00:00:00 2001 +From: Luis Menina <liberforce@freeside.fr> +Date: Mon, 04 Mar 2013 17:10:26 +0000 +Subject: Remove deprecated GnomeEntry. + +It is replaced by GtkEntry. This means we lose the history +functionality, but that could be reimplemented using GtkComboBoxText +with an entry. + +https://bugzilla.gnome.org/show_bug.cgi?id=589045 +--- +diff --git a/data/glade/sql.glade b/data/glade/sql.glade +index 2b12b85..f673ae0 100644 +--- a/data/glade/sql.glade ++++ b/data/glade/sql.glade +@@ -165,24 +165,16 @@ + </child> + + <child> +- <widget class="GnomeEntry" id="server_entry"> ++ <widget class="GtkEntry" id="server_entry"> + <property name="visible">True</property> +- <property name="history_id">database_server</property> +- <property name="max_saved">10</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="combo-entry1"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char" translatable="yes">*</property> +- <property name="activates_default">True</property> +- </widget> +- </child> ++ <property name="can_focus">True</property> ++ <property name="editable">True</property> ++ <property name="visibility">True</property> ++ <property name="max_length">0</property> ++ <property name="text" translatable="yes"></property> ++ <property name="has_frame">True</property> ++ <property name="invisible_char" translatable="yes">*</property> ++ <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> +@@ -194,24 +186,16 @@ + </child> + + <child> +- <widget class="GnomeEntry" id="user_entry"> ++ <widget class="GtkEntry" id="user_entry"> + <property name="visible">True</property> +- <property name="history_id">database_user</property> +- <property name="max_saved">10</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="combo-entry2"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char" translatable="yes">*</property> +- <property name="activates_default">True</property> +- </widget> +- </child> ++ <property name="can_focus">True</property> ++ <property name="editable">True</property> ++ <property name="visibility">True</property> ++ <property name="max_length">0</property> ++ <property name="text" translatable="yes"></property> ++ <property name="has_frame">True</property> ++ <property name="invisible_char" translatable="yes">*</property> ++ <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> +@@ -248,24 +232,16 @@ + </child> + + <child> +- <widget class="GnomeEntry" id="db_entry"> ++ <widget class="GtkEntry" id="db_entry"> + <property name="visible">True</property> +- <property name="history_id">database_name</property> +- <property name="max_saved">10</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="combo-entry3"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char" translatable="yes">*</property> +- <property name="activates_default">True</property> +- </widget> +- </child> ++ <property name="can_focus">True</property> ++ <property name="editable">True</property> ++ <property name="visibility">True</property> ++ <property name="max_length">0</property> ++ <property name="text" translatable="yes"></property> ++ <property name="has_frame">True</property> ++ <property name="invisible_char" translatable="yes">*</property> ++ <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> +diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c +index 14a088c..ea2f46a 100644 +--- a/src/planner-sql-plugin.c ++++ b/src/planner-sql-plugin.c +@@ -27,7 +27,6 @@ + #include <stdlib.h> + #include <glib.h> + #include <glib/gi18n.h> +-#include <libgnomeui/gnome-entry.h> + #include <glade/glade.h> + #include <gtk/gtk.h> + #include <libgda/libgda.h> +@@ -950,12 +949,9 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin, + + gtk_window_set_title (GTK_WINDOW (dialog), title); + +- server_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "server_entry"))); +- db_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "db_entry"))); +- user_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "user_entry"))); ++ server_entry = glade_xml_get_widget (gui, "server_entry"); ++ db_entry = glade_xml_get_widget (gui, "db_entry"); ++ user_entry = glade_xml_get_widget (gui, "user_entry"); + password_entry = glade_xml_get_widget (gui, "password_entry"); + + str = planner_conf_get_string (CONF_SERVER, NULL); +-- +cgit v0.9.2 diff --git a/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch new file mode 100644 index 000000000..1ee60f528 --- /dev/null +++ b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch @@ -0,0 +1,114 @@ +From f9840c342e4b5767ee35f0d326b7f7eaf56850ed Mon Sep 17 00:00:00 2001 +From: Alexandre Franke <alexandre.franke@gmail.com> +Date: Mon, 05 Mar 2012 17:22:56 +0000 +Subject: Fix for broken "open file on startup" behaviour + +Switch to gtk_init_with_args from GnomeProgam broke opening of files from command line and when double clicking on file in file browser. + +Based on patches 193670 and 193835 by Maxim Zakharov. + +https://bugzilla.gnome.org/show_bug.cgi?id=656373 +--- +diff --git a/src/planner-main.c b/src/planner-main.c +index cdeb8ea..c0aabd2 100644 +--- a/src/planner-main.c ++++ b/src/planner-main.c +@@ -37,7 +37,7 @@ static gchar **args_remaining = NULL; + + static GOptionEntry options[] = { + { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, N_("Create the initial window with the given geometry."), N_("GEOMETRY")}, +- { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES") }, ++ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES|URIs") }, + { NULL } + }; + +@@ -92,26 +92,27 @@ main (int argc, char **argv) + + gtk_widget_show_all (main_window); + +- if (argc > 1) { +- i = 1; +- while (argv[i]) { +- if (g_str_has_prefix (argv[i], "file:")) { ++ if (args_remaining != NULL) { ++ for (i = 0; args_remaining[i]; i++) { ++ gchar *scheme = g_uri_parse_scheme(args_remaining[i]); ++ if (scheme != NULL) { + planner_window_open_in_existing_or_new ( +- PLANNER_WINDOW (main_window), argv[i], FALSE); ++ PLANNER_WINDOW (main_window), args_remaining[i], FALSE); ++ g_free(scheme); + } else { + gchar *uri; + +- if (!g_path_is_absolute (argv[i])) { ++ if (!g_path_is_absolute (args_remaining[i])) { + /* Relative path. */ + gchar *cwd, *tmp; + + cwd = g_get_current_dir (); +- tmp = g_build_filename (cwd, argv[i], NULL); ++ tmp = g_build_filename (cwd, args_remaining[i], NULL); + uri = g_filename_to_uri (tmp, NULL, NULL); + g_free (tmp); + g_free (cwd); + } else { +- uri = g_filename_to_uri (argv[i], NULL, NULL); ++ uri = g_filename_to_uri (args_remaining[i], NULL, NULL); + } + + if (uri) { +@@ -120,8 +121,6 @@ main (int argc, char **argv) + g_free (uri); + } + } +- +- i++; + } + } + +diff --git a/src/planner-window.c b/src/planner-window.c +index 73f1766..b0536c3 100644 +--- a/src/planner-window.c ++++ b/src/planner-window.c +@@ -1726,36 +1726,24 @@ planner_window_open_in_existing_or_new (PlannerWindow *window, + { + PlannerWindowPriv *priv; + GtkWidget *new_window; +- gchar *filename; + gboolean ret; + + priv = window->priv; +- +- filename = g_filename_from_uri (uri, NULL, NULL); +- if (!filename) { +- return FALSE; +- } +- + if (mrp_project_is_empty (priv->project)) { +- ret = planner_window_open (window, filename, internal); +- g_free (filename); ++ ret = planner_window_open (window, uri, internal); + return ret; + } else { + new_window = planner_application_new_window (priv->application); +- if (planner_window_open (PLANNER_WINDOW (new_window), filename, internal)) { +- g_free (filename); ++ if (planner_window_open (PLANNER_WINDOW (new_window), uri, internal)) { + gtk_widget_show_all (new_window); + return TRUE; + } else { +- g_free (filename); + g_signal_emit (new_window, signals[CLOSED], 0, NULL); + gtk_widget_destroy (new_window); + return FALSE; + } + } + +- g_free (filename); +- + return FALSE; + } + +-- +cgit v0.9.2 diff --git a/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch new file mode 100644 index 000000000..7c1b1d5ef --- /dev/null +++ b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch @@ -0,0 +1,41 @@ +From fd8da8994f7006b9fcefc90d2fe5c2b484c7871e Mon Sep 17 00:00:00 2001 +From: Luis Menina <liberforce@freeside.fr> +Date: Mon, 04 Mar 2013 13:42:22 +0000 +Subject: Remove deprecated libgnomeui. + +https://bugzilla.gnome.org/show_bug.cgi?id=589045 +--- +diff --git a/README b/README +index e6d5c31..b2489ef 100644 +--- a/README ++++ b/README +@@ -59,7 +59,6 @@ Dependencies: + GLIB 2.6.0 + GTK 2.14.0 + LIBGNOMECANVAS 2.10.0 +-LIBGNOMEUI 2.10.0 + LIBGLADE 2.3.0 + GNOME_VFS 2.10.0 + GCONF 2.10.0 +diff --git a/configure.in b/configure.in +index 9f3d112..06568fd 100644 +--- a/configure.in ++++ b/configure.in +@@ -67,7 +67,6 @@ dnl it too, or it will never make it into the spec file! + GLIB_REQUIRED=2.6.0 + GTK_REQUIRED=2.14.0 + LIBGNOMECANVAS_REQUIRED=2.10.0 +-LIBGNOMEUI_REQUIRED=2.10.0 + LIBGLADE_REQUIRED=2.3.0 + GNOME_VFS_REQUIRED=2.10.0 + GCONF_REQUIRED=2.10.0 +@@ -116,7 +115,6 @@ PKG_CHECK_MODULES(PLANNER, + gobject-2.0 gmodule-2.0 + gtk+-2.0 >= $GTK_REQUIRED + libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED +- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + ]) +-- +cgit v0.9.2 diff --git a/community/planner/planner.install b/community/planner/planner.install new file mode 100644 index 000000000..9d325dbb1 --- /dev/null +++ b/community/planner/planner.install @@ -0,0 +1,26 @@ +pkgname=planner + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index c2557b7d1..ecc0580c6 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $ +# $Id: PKGBUILD 104598 2014-01-23 11:45:02Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.1 +pkgver=2.1.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming environment for creating images, animations and interactions' @@ -10,18 +10,18 @@ url='http://www.processing.org/' license=('GPL' 'LGPL') depends=('libgl' 'libxxf86vm') makedepends=('gendesk') -options=('!strip') # 'staticlibs') +options=('!strip') if [[ $CARCH == "x86_64" ]]; then source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('e1799b9ec86633f4fd2c45905d6ac7897f14b1de4ea4913d7ad5b3b8956917d7' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('9b4db11ea9b7b16a4c2c36987a1fadb4971e36023a7fa3259d7763e068b17284' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi prepare() { diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 932d90dac..eca4ff9be 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 103927 2014-01-13 17:17:01Z andyrtr $ +# $Id: PKGBUILD 104588 2014-01-23 09:47:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.4.8 +pkgver=7.4.9 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -16,13 +16,12 @@ optdepends=('postgresql-libs: PostgreSQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' - 'etc/logrotate.d/rsyslog' - 'etc/conf.d/rsyslog') + 'etc/logrotate.d/rsyslog') options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('20100bede92ce27778d426197b7caaac' +md5sums=('43c91cbc86b51979de61e868ff921f17' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 1fd92eacf..ec03643ef 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104548 2014-01-22 17:19:25Z arodseth $ +# $Id: PKGBUILD 104632 2014-01-23 14:12:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,14 +8,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.1.0 -pkgrel=1 +pkgver=2.0.0 +pkgrel=3 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204') +sha256sums=('6a36d2d4212e65f23d1c174b03006ea7fecaad1f3b82151dbfbe7ddf4268579f') prepare() { cd "ruby-gtk2-$pkgver" diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index ff3aff3a7..3a974c28a 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92836 2013-06-16 15:30:03Z arodseth $ +# $Id: PKGBUILD 104595 2014-01-23 10:58:45Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -6,7 +6,7 @@ # Contributor: kritoke <kritoke@nospam.gmail.com> pkgbase=ruby-gtk3 -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") @@ -15,7 +15,7 @@ url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('cc55542b207899af2bc0489c004c394b2332656cbf25ef3ff0daceff39535047') +sha256sums=('436844cc9ab3bf5e5a3027e3276fc69ff9cae5cff88bc60179c416050d5e753d') prepare() { cd "$srcdir/ruby-gtk3-$pkgver" diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index f513762f9..4ebf7067a 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101260 2013-11-21 10:27:21Z spupykin $ +# $Id: PKGBUILD 104606 2014-01-23 13:18:27Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD deleted file mode 100644 index fd908af5f..000000000 --- a/community/subtle/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 86887 2013-03-23 23:10:50Z td123 $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: unexist <unexist@dorfelite.net> -# Contributor: Abakus <java5@arcor.de> -# Contributor: TDY <tdy@gmx.com> -# Contributor: Xilon <xilonmu@gmail.com> - -pkgname=subtle -pkgver=0.11.3224 -pkgrel=2 -pkgdesc='Grid-based manual tiling window manager' -arch=('x86_64' 'i686') -url='http://subtle.subforge.org/' -license=('GPL') -depends=('ruby' 'libxft' 'libxpm' 'libxrandr' 'libxft' 'libxpm' 'libxinerama' - 'libxtst') -makedepends=('pkg-config' 'libxinerama' 'libxrandr' 'libxft' 'libxpm') -backup=('etc/xdg/subtle/subtle.rb') -install=subtle.install -source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2") -sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2') - -build() { - cd "$srcdir/$pkgname-$pkgver-xi" - - # Disable the check for Ruby 1.9 - sed -i 's/ 1 != / 7 == /' Rakefile - sed -i 's/ 9 != / 7 == /' Rakefile - # Use vendor_ruby instead of site_ruby - sed -e \ - 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \ - -i Rakefile -} - -package() { - cd "$srcdir/$pkgname-$pkgver-xi" - - rake destdir=$pkgdir install --trace -} - -# vim:set ts=2 sw=2 et: diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install deleted file mode 100644 index cdb0d9469..000000000 --- a/community/subtle/subtle.install +++ /dev/null @@ -1,7 +0,0 @@ -post_upgrade() { - echo "In order to use sur you can install ruby-curb and ruby-minitar." - echo "If you have subtle on your system remember to upgrade with:" - echo " sur upgrade" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index a7c79c544..457d0cc57 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100581 2013-11-06 10:52:39Z arodseth $ +# $Id: PKGBUILD 104600 2014-01-23 12:22:43Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jeff Horelick <jdhore1@gmail.com> # Contributor: skydrome <skydrome@i2pmail.org> pkgname=the_silver_searcher -pkgver=0.18.1 +pkgver=0.19.1 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' @@ -12,7 +12,7 @@ license=('Apache') depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686') source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('1f5cdacf955d5707cdb60f3f46aab3aae7fe96f105f00ab2d6a5a52d0aad5dc5') +sha256sums=('698cde7a8170ef1623f594d251aac846e720dc257c170f9c21102b3f2f1d4448') prepare() { cd "$pkgname-$pkgver" diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 85f4c8542..58494ab7d 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $ +# $Id: PKGBUILD 204572 2014-01-23 02:27:38Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.2_20130928 +pkgver=1.2_20140112 pkgrel=1 epoch=1 pkgdesc="A tool to display dialog boxes from shell scripts" @@ -15,7 +15,7 @@ license=('LGPL2.1') depends=('ncurses') options=('staticlibs') source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) -sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c') +sha256sums=('8d30043872c57d4d3b3b05e4390ece356843f2a71303c91a2f8a536b369e0077') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 8adcf754b..4e5c7e5bf 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $ +# $Id: PKGBUILD 204571 2014-01-23 02:27:37Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.8 +_sudover=1.8.9p4 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,7 +16,7 @@ depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9' +sha256sums=('1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7' 'SKIP' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') diff --git a/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch b/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch new file mode 100644 index 000000000..684aedaec --- /dev/null +++ b/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Todd C. Miller <Todd.Miller@courtesan.com> +# Date 1389722096 25200 +# Node ID a204b69d91f786444899ce3fc95ed535b6e32d33 +# Parent 987087ce465828da121b9d67412f42feaea06d56 +If not logging I/O we may get EOF when the command is executed and +the other end of the backchannel is closed. Just remove the +backchannel event in this case or we will continue to receive +the event. Bug #631 + +diff -r 987087ce4658 -r a204b69d91f7 src/exec.c +--- a/src/exec.c Tue Jan 14 09:26:14 2014 -0700 ++++ b/src/exec.c Tue Jan 14 10:54:56 2014 -0700 +@@ -230,11 +230,14 @@ + /* Short read or EOF. */ + sudo_debug_printf(SUDO_DEBUG_ERROR, + "failed to read child status: %s", n ? "short read" : "EOF"); +- /* +- * If not logging I/O we may get EOF when the command is +- * executed and sv is closed. It is safe to ignore this. +- */ +- if (ec->log_io || n != 0) { ++ if (!ec->log_io && n == 0) { ++ /* ++ * If not logging I/O we may get EOF when the command is ++ * executed and the other end of the backchannel is closed. ++ * Just remove the event in this case. ++ */ ++ (void)sudo_ev_del(ec->evbase, backchannel_event); ++ } else { + /* XXX - need new CMD_ type for monitor errors. */ + errno = n ? EIO : ECONNRESET; + ec->cstat->type = CMD_ERRNO; + diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index d2a790e3f..a0e0f6e16 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204343 2014-01-17 09:42:39Z ronald $ +# $Id: PKGBUILD 204578 2014-01-23 13:18:51Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index 5231f60fc..1fb5e77f8 100644 --- a/extra/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $ +# $Id: PKGBUILD 204592 2014-01-23 13:42:13Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-compat -pkgver=0.10.10 -pkgrel=2 +pkgver=0.10.11 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ depends=( makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 ffmpeg-0.10.10-freetype2.patch) -sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91' +sha256sums=('99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0' '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988') prepare() { diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 7fce3677f..0395eb72b 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 204105 2014-01-15 10:16:24Z svenstaro $ +# $Id: PKGBUILD 204579 2014-01-23 13:18:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64') diff --git a/extra/libpaper/PKGBUILD b/extra/libpaper/PKGBUILD index 67b0e0731..869f06b11 100644 --- a/extra/libpaper/PKGBUILD +++ b/extra/libpaper/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 204542 2014-01-22 12:18:23Z andyrtr $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# $Id: PKGBUILD 204595 2014-01-23 16:54:36Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +# Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: royrocks <royrocks13@gmail.com> pkgname=libpaper pkgver=1.1.24 -pkgrel=6 +pkgrel=7 pkgdesc='Library for handling paper characteristics' arch=('x86_64' 'i686') url='http://packages.debian.org/unstable/source/libpaper' license=('GPL') depends=('sh') +backup=('etc/papersize') source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz") sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') @@ -25,7 +28,21 @@ build() { } package() { - make -C "$pkgname-$pkgver+nmu2" DESTDIR="$pkgdir" install -} + cd "$pkgname-$pkgver+nmu2" + make DESTDIR="$pkgdir" install + + # add systemwide default papersize read by many office applications + install -dm 755 $pkgdir/etc + echo '# Simply write the paper name. See papersize(5) for possible values' > $pkgdir/etc/papersize -# vim:set ts=2 sw=2 et: + # add libpaper.d directory other packages can use to store files + install -dm 755 $pkgdir/etc/libpaper.d + + # add localisation + pushd debian/po + for i in `ls *.po`; do + install -dm 755 ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/; + msgfmt $i -o ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/${pkgname}.mo; + done + popd +} diff --git a/extra/libraw/PKGBUILD b/extra/libraw/PKGBUILD index 32db74053..70e1c9964 100644 --- a/extra/libraw/PKGBUILD +++ b/extra/libraw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 199050 2013-11-07 23:03:25Z andrea $ +# $Id: PKGBUILD 204577 2014-01-23 13:18:50Z andrea $ # Maintainer: Andre Scarpino <andrea@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,15 +6,15 @@ # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw -pkgver=0.15.4 -pkgrel=3 +pkgver=0.16.0 +pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') url="http://www.libraw.org/" license=('CDDL' 'LGPL' 'custom') depends=('lcms2' 'jasper') source=("http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz") -sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79') +sha256sums=('71f43871ec2535345c5c9b748f07813e49915170f9510b721a2be6478426cf96') build() { cd LibRaw-${pkgver} diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index eb29c5d5f..fe8795f58 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $ +# $Id: PKGBUILD 204568 2014-01-22 23:53:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors -pkgver=3.3.4 +pkgver=3.3.5 pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') @@ -11,27 +11,22 @@ license=('GPL' 'LGPL') depends=('perl' 'sysfsutils') makedepends=('rrdtool') optdepends=('rrdtool: for logging with sensord') -backup=('etc/sensors3.conf' 'etc/healthd.conf') -options=('!emptydirs') -source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ - healthd healthd.conf fancontrol.service sensord.service healthd.service \ - linux_3.0.patch lm_sensors-fancontrol.patch) -sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8' +backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') +source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} + healthd healthd.conf healthd.service sensord.conf + lm_sensors-fancontrol.patch) +sha1sums=('179989a52bae8f01ba8ed77e8a15af6ec653d89e' 'SKIP' '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' - '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - '73cd658f4a418197dc75f65d6d309701c72cfd81' - 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' + '1edd4d72ade22adfc128fb8d670e85c633fd1d18' 'd72ec328e9303acef86342483b6f8537de6117d9' - '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' + 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b' 'b0bc977348610d6a008d75a43f65800251c4c9f7') prepare() { cd ${pkgname}-${pkgver} - sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service} - sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect + sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service} sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service - patch -p0 -i "${srcdir}/linux_3.0.patch" patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch" } @@ -44,10 +39,12 @@ package() { cd ${pkgname}-${pkgver} make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install - install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service" + install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd" + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" - install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" - install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service" + install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" + install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service" + install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/" } diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service deleted file mode 100644 index 813dbd60d..000000000 --- a/extra/lm_sensors/fancontrol.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Fan control daemon - -[Service] -PIDFile=/var/run/fancontrol.pid -ExecStart=/usr/bin/fancontrol - -[Install] -WantedBy=multi-user.target diff --git a/extra/lm_sensors/healthd.conf b/extra/lm_sensors/healthd.conf index a8b2c3fa3..8df3e399d 100644 --- a/extra/lm_sensors/healthd.conf +++ b/extra/lm_sensors/healthd.conf @@ -1,5 +1,5 @@ # -# /etc/conf.d/healthd +# /etc/healthd.conf # # reset any pending alarms on startup diff --git a/extra/lm_sensors/linux_3.0.patch b/extra/lm_sensors/linux_3.0.patch deleted file mode 100644 index da02a3d49..000000000 --- a/extra/lm_sensors/linux_3.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200 -+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200 -@@ -2472,7 +2472,7 @@ - - sub initialize_kernel_version - { -- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/; -+ `uname -r` =~ /(\d+)\.(\d+)(.*)/; - @kernel_version = ($1, $2, $3, $4); - chomp($kernel_arch = `uname -m`); - diff --git a/extra/lm_sensors/sensord.conf b/extra/lm_sensors/sensord.conf new file mode 100644 index 000000000..133783aa8 --- /dev/null +++ b/extra/lm_sensors/sensord.conf @@ -0,0 +1,9 @@ +# +# /etc/conf.d/sensord +# + +#Specify the interval between scanning for sensor alarms +INTERVAL=60s + +#Specify the interval between logging all sensor readings +LOG_INTERVAL=30m diff --git a/extra/lm_sensors/sensord.service b/extra/lm_sensors/sensord.service deleted file mode 100644 index 1d62ab9e8..000000000 --- a/extra/lm_sensors/sensord.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Sensor information logging daemon - -[Service] -PIDFile=/var/run/sensord.pid -ExecStart=/usr/bin/sensord - -[Install] -WantedBy=multi-user.target diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index 094b417b7..d2a17efdc 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198380 2013-10-30 14:31:14Z allan $ +# $Id: PKGBUILD 204570 2014-01-23 02:24:11Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,13 +6,13 @@ pkgname=purple-plugin-pack pkgver=2.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64') url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" license=('GPL') depends=('libpurple') -makedepends=('intltool' 'gettext' 'python2' 'pidgin') +makedepends=('intltool' 'python2' 'pidgin') source=(https://bitbucket.org/rekkanoryo/$pkgname/downloads/$pkgname-$pkgver.tar.bz2) sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') diff --git a/extra/visualvm/PKGBUILD b/extra/visualvm/PKGBUILD index b75f938f5..3add21de3 100644 --- a/extra/visualvm/PKGBUILD +++ b/extra/visualvm/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Kristof JOZSA <kristof.jozsa@gmail.com> pkgname=visualvm -pkgver=1.3.6 +pkgver=1.3.7 _shortver=${pkgver//\./} -pkgrel=3 +pkgrel=1 pkgdesc='Visual tool integrating several commandline JDK tools and lightweight profiling capabilities' arch=('i686' 'x86_64') url='http://visualvm.java.net/' @@ -12,7 +12,7 @@ depends=('java-environment') source=("https://java.net/projects/${pkgname}/downloads/download/release${_shortver}/${pkgname}_${_shortver}.zip" 'visualvm.desktop' 'icon.png') -sha256sums=('317f65b3fed7ea25638b6d35c6f95642b5662453b7841a9d32aac3cf3ff59616' +sha256sums=('b8ff7762d9f8bb940bab6ec2ec890657682adf85d833e7e89e9cc4feda717b53' 'e820807e8d78446cf156a3947d97856e24865bb0d8c957e9ce2fed309c737441' '452fbd85c968ec7176c5894bc4106b7e25310314d44278d807510675b6a5c864') diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index de65bc557..1f6b300ab 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,7 +13,7 @@ _releasever=6 _rtpatchver=rt9 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 +pkgrel=2 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,6 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' + 'timers-do-not-raise-softirq-unconditionally.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' '4b18ce60daff87504e6740670edf6b50' @@ -44,6 +45,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' + 'a091e206b3cadcd9bcd807f3a0c98922' '71bbddd5f9799aa045660d92baa05845') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. @@ -64,6 +66,9 @@ prepare() { # add realtime patch patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch" + # revert patch, causing the kernel to hang on very early in the boot process + patch -p1 -R -i "${srcdir}/timers-do-not-raise-softirq-unconditionally.patch" + # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" diff --git a/kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch b/kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch new file mode 100644 index 000000000..d8f01f2d6 --- /dev/null +++ b/kernels/linux-libre-rt/timers-do-not-raise-softirq-unconditionally.patch @@ -0,0 +1,156 @@ +From 35b6173e6176fc978c635f9e07f1778eff7b76e7 Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner <tglx@linutronix.de> +Date: Thu, 7 Nov 2013 12:21:11 +0100 +Subject: [PATCH] timers: do not raise softirq unconditionally + +Mike, + +On Thu, 7 Nov 2013, Mike Galbraith wrote: + +> On Thu, 2013-11-07 at 04:26 +0100, Mike Galbraith wrote: +> > On Wed, 2013-11-06 at 18:49 +0100, Thomas Gleixner wrote: +> +> > > I bet you are trying to work around some of the side effects of the +> > > occasional tick which is still necessary despite of full nohz, right? +> > +> > Nope, I wanted to check out cost of nohz_full for rt, and found that it +> > doesn't work at all instead, looked, and found that the sole running +> > task has just awakened ksoftirqd when it wants to shut the tick down, so +> > that shutdown never happens. +> +> Like so in virgin 3.10-rt. Box is x3550 M3 booted nowatchdog +> rcu_nocbs=1-3 nohz_full=1-3, and CPUs1-3 are completely isolated via +> cpusets as well. + +well, that very same problem is in mainline if you add "threadirqs" to +the command line. But we can be smart about this. The untested patch +below should address that issue. If that works on mainline we can +adapt it for RT (needs a trylock(&base->lock) there). + +Though it's not a full solution. It needs some thought versus the +softirq code of timers. Assume we have only one timer queued 1000 +ticks into the future. So this change will cause the timer softirq not +to be called until that timer expires and then the timer softirq is +going to do 1000 loops until it catches up with jiffies. That's +anything but pretty ... + +What worries me more is this one: + + pert-5229 [003] d..h1.. 684.482618: softirq_raise: vec=9 [action=RCU] + +The CPU has no callbacks as you shoved them over to cpu 0, so why is +the RCU softirq raised? + +Thanks, + + tglx +------------------ +Message-id: <alpine.DEB.2.02.1311071158350.23353@ionos.tec.linutronix.de> +|CONFIG_NO_HZ_FULL + CONFIG_PREEMPT_RT_FULL = nogo +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + include/linux/hrtimer.h | 3 +-- + kernel/hrtimer.c | 31 +++++++------------------------ + kernel/timer.c | 23 ++++++++++++++++++++--- + 3 files changed, 28 insertions(+), 29 deletions(-) + +--- a/include/linux/hrtimer.h ++++ b/include/linux/hrtimer.h +@@ -461,9 +461,8 @@ extern int schedule_hrtimeout_range_cloc + unsigned long delta, const enum hrtimer_mode mode, int clock); + extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode); + +-/* Soft interrupt function to run the hrtimer queues: */ ++/* Called from the periodic timer tick */ + extern void hrtimer_run_queues(void); +-extern void hrtimer_run_pending(void); + + /* Bootup initialization: */ + extern void __init hrtimers_init(void); +--- a/kernel/hrtimer.c ++++ b/kernel/hrtimer.c +@@ -1694,30 +1694,6 @@ static void run_hrtimer_softirq(struct s + } + + /* +- * Called from timer softirq every jiffy, expire hrtimers: +- * +- * For HRT its the fall back code to run the softirq in the timer +- * softirq context in case the hrtimer initialization failed or has +- * not been done yet. +- */ +-void hrtimer_run_pending(void) +-{ +- if (hrtimer_hres_active()) +- return; +- +- /* +- * This _is_ ugly: We have to check in the softirq context, +- * whether we can switch to highres and / or nohz mode. The +- * clocksource switch happens in the timer interrupt with +- * xtime_lock held. Notification from there only sets the +- * check bit in the tick_oneshot code, otherwise we might +- * deadlock vs. xtime_lock. +- */ +- if (tick_check_oneshot_change(!hrtimer_is_hres_enabled())) +- hrtimer_switch_to_hres(); +-} +- +-/* + * Called from hardirq context every jiffy + */ + void hrtimer_run_queues(void) +@@ -1730,6 +1706,13 @@ void hrtimer_run_queues(void) + if (hrtimer_hres_active()) + return; + ++ /* ++ * Check whether we can switch to highres mode. ++ */ ++ if (tick_check_oneshot_change(!hrtimer_is_hres_enabled()) ++ && hrtimer_switch_to_hres()) ++ return; ++ + for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) { + base = &cpu_base->clock_base[index]; + if (!timerqueue_getnext(&base->active)) +--- a/kernel/timer.c ++++ b/kernel/timer.c +@@ -1439,8 +1439,6 @@ static void run_timer_softirq(struct sof + { + struct tvec_base *base = __this_cpu_read(tvec_bases); + +- hrtimer_run_pending(); +- + if (time_after_eq(jiffies, base->timer_jiffies)) + __run_timers(base); + } +@@ -1450,8 +1448,27 @@ static void run_timer_softirq(struct sof + */ + void run_local_timers(void) + { ++ struct tvec_base *base = __this_cpu_read(tvec_bases); ++ + hrtimer_run_queues(); +- raise_softirq(TIMER_SOFTIRQ); ++ /* ++ * We can access this lockless as we are in the timer ++ * interrupt. If there are no timers queued, nothing to do in ++ * the timer softirq. ++ */ ++ if (!spin_do_trylock(&base->lock)) { ++ raise_softirq(TIMER_SOFTIRQ); ++ return; ++ } ++ if (!base->active_timers) ++ goto out; ++ ++ /* Check whether the next pending timer has expired */ ++ if (time_before_eq(base->next_timer, jiffies)) ++ raise_softirq(TIMER_SOFTIRQ); ++out: ++ rt_spin_unlock_after_trylock_in_irq(&base->lock); ++ + } + + #ifdef __ARCH_WANT_SYS_ALARM diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD index 5881a4c2e..0a7cf95d5 100644 --- a/libre/gloobus-preview-libre/PKGBUILD +++ b/libre/gloobus-preview-libre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $ +# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> _pkgname=gloobus-preview pkgname=gloobus-preview-libre pkgver=0.4.5.290 _pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support" arch=('i686' 'x86_64') url="http://gloobus.net/" license=('GPL') -depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') +depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils') makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') replaces=$_pkgname conflicts=$_pkgname @@ -25,19 +25,22 @@ optdepends=('djvulibre: Preview DjVu documents' 'unoconv: Preview LibreOffice compatible documents' 'libarchive: View content of RAR archives' 'unzip: View content of .ZIP archives') -options=('!libtool') install=$_pkgname.install source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi fix-gtksource-include.patch fix-unoconv.patch use-xdg-open.patch + gloobus-preview-configuration-pygobject3-port.patch + gloobus-sushi-pygobject3-port.patch gloobus-preview-usr-bsdtar-for-rar.patch) md5sums=('27b3db2043ecaf47fa928940bbb4f32a' 'SKIP' 'ca15a3e31cec01d3d4fc5a4e1720f692' '03379c173e67ad1b6804bc609336451d' 'd6d9e2b3e001f0ea8440cccdf90480af' + '16e7a7d892dfde5fd40332fc41de97b0' + '7536f8fbbb2c6bbc0132a2fa25b296b7' 'eeab61846c861540bb16ca00fa14cdb6') prepare() { @@ -56,6 +59,9 @@ prepare() { # Use xdg-open patch -Np1 -i "$srcdir/use-xdg-open.patch" + # Port gloobus-preview-configuration to pygobject3 + patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch" + # Use bsdtar (libarchive) if unrar is not found. patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch" @@ -64,6 +70,9 @@ prepare() { # Python2 fix sed -i 's/python /python2 /' src/gloobus-sushi.in + + # Port gloobus-sushi to pygobject3 + patch -Np1 -i "$srcdir/gloobus-sushi-pygobject3-port.patch" } diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch new file mode 100644 index 000000000..2c2540753 --- /dev/null +++ b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch @@ -0,0 +1,124 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration 2014-01-22 21:54:41.555697168 +0100 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration 2014-01-22 21:34:36.867164953 +0100 +@@ -6,10 +6,9 @@ + import os + import sys + import glob +-import gtk ++from gi.repository import Gtk, GConf + import signal + import gettext +-import gconf + #import config + + #=========================== CLASS COLORS =======================================================# +@@ -69,54 +68,54 @@ + def __init__(self): + self.config = config_load() + +- self.client = gconf.client_get_default() ++ self.client = GConf.Client.get_default() + self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout') + + #================= Show In Taskbar ================= # +- self.entry1 = gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) ++ self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) + self.entry1.set_tooltip_markup(_("When enabled gloobus-preview will be\nshown in the <b>taskbar</b>")) + self.entry1.set_active(self.config.getboolean("Main","taskbar")) + + #================= Allways on top ================= # +- self.entry2 = gtk.CheckButton(label=_("Always on top"), use_underline=False) ++ self.entry2 = Gtk.CheckButton(label=_("Always on top"), use_underline=False) + self.entry2.set_tooltip_markup(_("When enabled gloobus-preview will be\n<b>always on top</b> of the other windows")) + self.entry2.set_active(self.config.getboolean("Main","ontop")) + win.set_keep_above(self.config.getboolean("Main","ontop")) + + + #================= Quit on lose focus ================= # +- self.entry3 = gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) ++ self.entry3 = Gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) + self.entry3.set_tooltip_markup(_("When enabled, gloobus-preview will <b>exit</b>\nwhen it loses focus")) + self.entry3.set_active(self.config.getboolean("Main","focus")) + + #================= Win bar layout ================= # +- self.entry4 = gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) ++ self.entry4 = Gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) + self.entry4.set_tooltip_markup(_("Layout of the buttons\nclose button on the right/left?")) + self.entry4.set_active(self.config.getboolean("Main","winbar_layout")) + + #================= Use gtk theme ================= # +- self.theme_gtk_entry = gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) ++ self.theme_gtk_entry = Gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) + self.theme_gtk_entry.set_tooltip_markup(_("When enabled, gloobus-preview will use system GTK theme")) + self.theme_gtk_entry.set_active(self.config.getboolean("Theme","gtk")) + + #=================== BUTTONS ===================== # +- container0 = gtk.HBox(True,1) #Save and close buttons ++ container0 = Gtk.HBox(True,1) #Save and close buttons + +- ok_button = gtk.Button(_("Save")) +- cancel_button = gtk.Button(_("Cancel")) ++ ok_button = Gtk.Button(_("Save")) ++ cancel_button = Gtk.Button(_("Cancel")) + + container0.add(cancel_button) + container0.add(ok_button) +- cancel_button.connect('clicked', gtk.main_quit) ++ cancel_button.connect('clicked', Gtk.main_quit) + ok_button.connect('clicked', self.save_conf) + + #============ GENERAL CONTAINER ================== # + +- general_container = gtk.VBox(False,1) ++ general_container = Gtk.VBox(False,1) + +- title = gtk.Label() ++ title = Gtk.Label() + title.set_markup(_("<b>Main settings</b>")) +- align2 = gtk.Alignment(0,0,0,0) ++ align2 = Gtk.Alignment.new(0,0,0,0) + align2.set_padding(0,5,0,0) + align2.add(title) + +@@ -128,11 +127,11 @@ + if self.gconf_win_layout == None: + general_container.add(self.entry4) #Always on top + +- general_container.add(gtk.HSeparator()) +- general_container.add(gtk.Label()) #White Space ++ general_container.add(Gtk.HSeparator()) ++ general_container.add(Gtk.Label()) #White Space + general_container.add(container0) #Close & save buttons + +- align = gtk.Alignment(0,0,0,0); ++ align = Gtk.Alignment.new(0,0,0,0); + align.set_padding(10,5,10,10) + + align.add(general_container) +@@ -155,7 +154,7 @@ + + config_save(self.config) + +- gtk.main_quit() ++ Gtk.main_quit() + + + #==================================== GLOBAL FUNCTIONS ===============================================# +@@ -232,13 +231,13 @@ + g.debug("Path: " + abspath) + g.debug("Config File: " + CONFIG_PATH) + +-win = gtk.Window() ++win = Gtk.Window() + win.set_title(_("Gloobus-Preview Configuration")) + #win.set_default_size(400,150) +-win.connect('delete-event', gtk.main_quit) ++win.connect('delete-event', Gtk.main_quit) + + + gui = GUI() + +-gtk.main() ++Gtk.main() + diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch new file mode 100644 index 000000000..f748da875 --- /dev/null +++ b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch @@ -0,0 +1,21 @@ +diff -Naur gloobus-sushi.orig/src/gloobus-sushi.py gloobus-sushi/src/gloobus-sushi.py +--- gloobus-sushi.orig/src/gloobus-sushi.py 2014-01-22 21:54:41.297590000 +0100 ++++ gloobus-sushi/src/gloobus-sushi.py 2014-01-22 21:45:21.244184455 +0100 +@@ -16,7 +16,7 @@ + + import dbus + import dbus.service +-import gobject ++from gi.repository import GObject + import os + + from dbus.mainloop.glib import DBusGMainLoop +@@ -28,7 +28,7 @@ + def __init__(self): + bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus()) + super(DBusWrapper, self).__init__(bus_name, DBUS_PATH) +- self.loop = gobject.MainLoop() ++ self.loop = GObject.MainLoop() + self.loop.run() + + @dbus.service.method(DBUS_NAME) diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD index f88607e0a..1c87aaef4 100644 --- a/pcr/emacs-lucid/PKGBUILD +++ b/pcr/emacs-lucid/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Maintainer (Arch): Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> @@ -6,7 +5,7 @@ _pkgname=emacs pkgname=emacs-lucid pkgver=24.3 -pkgrel=4 +pkgrel=5 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD index 0ae4e4e76..5c4ff0c3a 100644 --- a/pcr/hunspell-pt-br/PKGBUILD +++ b/pcr/hunspell-pt-br/PKGBUILD @@ -5,14 +5,14 @@ pkgname=hunspell-pt-br pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Portuguese (Brazil) dictionary" arch=(any) url="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico" license=('LGPLv3' 'MPL') optdepends=('hunspell: the spell checking libraries and apps') -source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOG.oxt) -md5sums=('3b2f7291d486435cf6706b55e02da5b6') +source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOC.oxt) +md5sums=('9a9ac174c401406604bfcf101de2a7ba') package() { install -D -m644 ${srcdir}/pt_BR.dic ${pkgdir}/usr/share/hunspell/pt_BR.dic diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index a88d99bb6..856d909e2 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.22.3 +pkgver=2014.01.23.2 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=('16f30350b5de9f13174839670565eb4f' +md5sums=('4be7593dfe2a7d1db6c08e5543b0e2e0' 'SKIP') |