diff options
92 files changed, 918 insertions, 545 deletions
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD index 00bb7c247..1b4ac12da 100644 --- a/community/bsd-games/PKGBUILD +++ b/community/bsd-games/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86789 2013-03-22 02:13:44Z eric $ +# $Id: PKGBUILD 90951 2013-05-16 09:13:23Z lcarlier $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> pkgname=bsd-games pkgver=2.17 -pkgrel=13 +pkgrel=14 pkgdesc="A linux port for a collection of BSD command line games." url="ftp://ftp.ibiblio.org/pub/Linux/games/" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz number.c.diff bsd-games-2.17-64bit.patch bad-ntohl-cast.diff null-check.diff) md5sums=('238a38a3a017ca9b216fc42bde405639' - '9916baef5cb8aa09361f67de12ca7bef' + '2ea80281ee9993a9ee47323e78349a2a' '784f68c796b9e099ac008aecef1af998' '9c0fa6e2345bd0a7945c9a41d5ba68aa' '5356bd6999ae53dd27cb2a0f837a3e70' @@ -27,8 +27,9 @@ md5sums=('238a38a3a017ca9b216fc42bde405639' '3d21a9dad2e603ddf3842972e4ff85a1' 'a43ca0b4b9ebc4eec26372c52014ac0a') -build() { +prepare() { cd "${srcdir}/$pkgname-$pkgver" + [ "$CARCH" = "x86_64" ] && patch -p1 < "$srcdir/bsd-games-2.17-64bit.patch" cp "${srcdir}/config.params" . @@ -63,8 +64,11 @@ build() { # Prior to release 2.17-10 of the ArchLinux package, wargames was # broken, since binaries are in /usr/bin instead. sed -i -e 's|/usr/games|/usr/bin|g' wargames/wargames +} + +build() { + cd "${srcdir}/$pkgname-$pkgver" -# Build. ./configure make } diff --git a/community/bsd-games/config.params b/community/bsd-games/config.params index 6afa0e43f..f061d8f26 100644 --- a/community/bsd-games/config.params +++ b/community/bsd-games/config.params @@ -2,7 +2,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=PKGDIR bsd_games_cfg_no_build_dirs='banner fortune wtf factor monop' bsd_games_cfg_gamesdir=/usr/bin -bsd_games_cfg_sbindir=/usr/sbin +bsd_games_cfg_sbindir=/usr/bin bsd_games_cfg_man6dir=/usr/share/man/man6 bsd_games_cfg_man5dir=/usr/share/man/man5 bsd_games_cfg_man8dir=/usr/share/man/man8 diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index 777c75284..fd090db52 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90378 2013-05-12 06:05:15Z bpiotrowski $ +# $Id: PKGBUILD 90949 2013-05-16 06:57:01Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.80.1 -pkgrel=2 +pkgrel=3 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686') url='http://www.exim.org/' @@ -13,8 +13,8 @@ license=('GPL') backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim) install=exim.install depends=('db' 'pcre' 'pam' 'openssl' 'libldap') -provides=('smtp-server') -conflicts=('smtp-server') +provides=('smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') options=('!makeflags') source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2" aliases @@ -65,10 +65,13 @@ package() { cp "$srcdir/aliases" "$pkgdir/etc/mail" + install -d "$pkgdir/usr/sbin" cd "$pkgdir/usr/bin" for i in mailq rmail rsmtp runq sendmail; do ln -s exim "$i" + ln -s ../bin/exim ../sbin/"$i" done + # fhs compliancy ln -s ../bin/exim ../lib/sendmail diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index c6f12cd2a..52fe0bf3f 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,21 +1,18 @@ -# $Id: PKGBUILD 90623 2013-05-13 11:47:21Z arodseth $ +# $Id: PKGBUILD 90958 2013-05-16 14:50:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Thanks to Moonprincessluna at DeviantArt for the default icon: -# http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a - pkgname=gendesk -pkgver=0.5.0 +pkgver=0.5.2 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') url='http://roboticoverlords.org/gendesk/' license=('MIT') -depends=('glibc') makedepends=('go') +depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('05693b8cb6562407b0f61f855b3e61bfe063acec4c1bd42c609f469d25fb080c' +sha256sums=('33a989aa7603d2cb15711137f653a8985143297a2ab7532dfad1c15aa649fe17' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index a21cfe27d..462b6ff07 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90940 2013-05-15 21:35:03Z faidoc $ +# $Id: PKGBUILD 90969 2013-05-16 21:05:16Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -16,9 +16,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch") + "switch-applications.patch" + "fix-dnd.patch") sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' + '4d8f5ed1bec02160d252a956ffd441ab3c119db29f690f86568dbd34474d1a90') build() { cd ${pkgname}-${pkgver} @@ -26,6 +28,9 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch + # Fix unresponsive panel on DND + patch -Np1 -i ../fix-dnd.patch + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch new file mode 100644 index 000000000..268ea296e --- /dev/null +++ b/community/muffin/fix-dnd.patch @@ -0,0 +1,51 @@ +From 9f3216b081104c92c4ce5ce3ca2cc48f14bad85a Mon Sep 17 00:00:00 2001 +From: Albert Pool <albertpool@solcon.nl> +Date: Mon, 13 May 2013 12:04:17 +0200 +Subject: [PATCH 1/2] Remove NOTIFICATION from top window group + +--- + src/compositor/meta-window-actor.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index de8d292..7b0f83c 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -1514,7 +1514,6 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) + if (window->type == META_WINDOW_DROPDOWN_MENU || + window->type == META_WINDOW_POPUP_MENU || + window->type == META_WINDOW_COMBO || +- window->type == META_WINDOW_NOTIFICATION || + window->type == META_WINDOW_OVERRIDE_OTHER){ + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); +-- +1.8.1.6 + + +From bbbde724320036f894779c2402fc6eba969428d2 Mon Sep 17 00:00:00 2001 +From: Albert Pool <albertpool@solcon.nl> +Date: Mon, 13 May 2013 12:09:58 +0200 +Subject: [PATCH 2/2] Remove OVERRIDE_OTHER from top window group + +--- + src/compositor/meta-window-actor.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index 7b0f83c..fb77f1d 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -1513,8 +1513,7 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) + + if (window->type == META_WINDOW_DROPDOWN_MENU || + window->type == META_WINDOW_POPUP_MENU || +- window->type == META_WINDOW_COMBO || +- window->type == META_WINDOW_OVERRIDE_OTHER){ ++ window->type == META_WINDOW_COMBO) { + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); + } +-- +1.8.1.6 + diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index 97d7aaff2..7dae25c99 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87881 2013-04-08 12:41:31Z jconder $ +# $Id: PKGBUILD 90942 2013-05-16 02:47:08Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit') pkgver=0.7.6 -pkgrel=9 +pkgrel=10 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') url="http://www.packagekit.org" @@ -18,7 +18,7 @@ source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" 'libarchive.patch') sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d' 'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8' - 'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415' + 'c7f6da04f5b8f09e6d884ae4f480c064eae10de1d2528bf14d2f55b34e472c23' '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2') build() { @@ -31,6 +31,7 @@ build() { patch -Np1 -i "$srcdir/adopt.patch" patch -Np1 -i "$srcdir/alpm.patch" patch -Np1 -i "$srcdir/libarchive.patch" + sed -i 's@sbin_PROGRAMS@bin_PROGRAMS@' 'contrib/device-rebind/Makefile.am' export PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr \ @@ -52,7 +53,7 @@ build() { --disable-dummy \ --enable-alpm \ --with-default-backend=alpm - make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs' + make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-suggest-attribute=format' } package_packagekit() { diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch index 8b972b291..a15fafeb2 100644 --- a/community/packagekit/alpm.patch +++ b/community/packagekit/alpm.patch @@ -1080,7 +1080,7 @@ index d2f363b..80d5ae0 100644 out: diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c -index 76402f0..5e32151 100644 +index 76402f0..554f06d 100644 --- a/backends/alpm/pk-backend-transaction.c +++ b/backends/alpm/pk-backend-transaction.c @@ -63,7 +63,7 @@ alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename) @@ -1130,7 +1130,15 @@ index 76402f0..5e32151 100644 if (percent == recent) { break; } -@@ -388,6 +393,17 @@ pk_backend_output (PkBackend *self, const gchar *output) +@@ -316,7 +321,6 @@ pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1, + case ALPM_QUESTION_REPLACE_PKG: + case ALPM_QUESTION_CONFLICT_PKG: + case ALPM_QUESTION_CORRUPTED_PKG: +- case ALPM_QUESTION_LOCAL_NEWER: + /* these actions are mostly harmless */ + g_debug ("safe question %d", question); + *result = 1; +@@ -388,6 +392,17 @@ pk_backend_output (PkBackend *self, const gchar *output) } static void @@ -1148,7 +1156,7 @@ index 76402f0..5e32151 100644 pk_backend_transaction_dep_resolve (PkBackend *self) { g_return_if_fail (self != NULL); -@@ -427,7 +443,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) +@@ -427,7 +442,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) name = alpm_pkg_get_name (pkg); version = alpm_pkg_get_version (pkg); @@ -1158,7 +1166,7 @@ index 76402f0..5e32151 100644 pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); optdepends = alpm_pkg_get_optdepends (pkg); -@@ -435,8 +452,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) +@@ -435,8 +451,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) pk_backend_output (self, "Optional dependencies:\n"); for (i = optdepends; i != NULL; i = i->next) { @@ -1170,7 +1178,7 @@ index 76402f0..5e32151 100644 pk_backend_output (self, output); g_free (output); } -@@ -467,7 +486,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg) +@@ -467,7 +485,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg) name = alpm_pkg_get_name (pkg); version = alpm_pkg_get_version (pkg); @@ -1180,7 +1188,7 @@ index 76402f0..5e32151 100644 pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); pk_backend_output_end (self); } -@@ -498,45 +518,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg, +@@ -498,45 +517,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg, pk_backend_output_start (self, pkg); } @@ -1307,7 +1315,7 @@ index 76402f0..5e32151 100644 pk_backend_transaction_setup (PkBackend *self) { g_return_if_fail (self != NULL); -@@ -545,12 +626,46 @@ pk_backend_transaction_setup (PkBackend *self) +@@ -545,12 +625,46 @@ pk_backend_transaction_setup (PkBackend *self) } static void @@ -1355,7 +1363,7 @@ index 76402f0..5e32151 100644 switch (event) { case ALPM_EVENT_CHECKDEPS_START: case ALPM_EVENT_RESOLVEDEPS_START: -@@ -559,7 +674,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, +@@ -559,7 +673,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, case ALPM_EVENT_FILECONFLICTS_START: case ALPM_EVENT_INTERCONFLICTS_START: @@ -1363,7 +1371,7 @@ index 76402f0..5e32151 100644 case ALPM_EVENT_DELTA_INTEGRITY_START: case ALPM_EVENT_DISKSPACE_START: pk_backend_transaction_test_commit (backend); -@@ -582,23 +696,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, +@@ -582,23 +695,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, break; case ALPM_EVENT_UPGRADE_START: @@ -1438,7 +1446,7 @@ index 76402f0..5e32151 100644 default: g_debug ("unhandled event %d", event); break; -@@ -623,7 +787,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags, +@@ -623,7 +786,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags, g_return_val_if_fail (cancellable != NULL, FALSE); if (alpm_trans_init (alpm, flags) < 0) { @@ -1447,7 +1455,7 @@ index 76402f0..5e32151 100644 g_set_error_literal (error, ALPM_ERROR, errno, alpm_strerror (errno)); return FALSE; -@@ -692,6 +856,7 @@ alpm_depend_free (alpm_depend_t *depend) +@@ -692,6 +855,7 @@ alpm_depend_free (alpm_depend_t *depend) { free (depend->name); free (depend->version); @@ -1455,7 +1463,7 @@ index 76402f0..5e32151 100644 free (depend); } -@@ -731,7 +896,7 @@ alpm_conflict_build_list (const alpm_list_t *i) +@@ -731,7 +895,7 @@ alpm_conflict_build_list (const alpm_list_t *i) g_string_append_printf (list, "%s <-> %s (%s), ", conflict->package1, conflict->package2, reason); @@ -1464,7 +1472,7 @@ index 76402f0..5e32151 100644 } } -@@ -837,12 +1002,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) +@@ -837,12 +1001,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) } if (prefix != NULL) { @@ -1479,7 +1487,7 @@ index 76402f0..5e32151 100644 g_set_error_literal (error, ALPM_ERROR, errno, alpm_strerror (errno)); } -@@ -959,12 +1124,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) +@@ -959,12 +1123,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) } if (prefix != NULL) { @@ -1494,7 +1502,7 @@ index 76402f0..5e32151 100644 g_set_error_literal (error, ALPM_ERROR, errno, alpm_strerror (errno)); } -@@ -993,7 +1158,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error) +@@ -993,7 +1157,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error) } if (alpm_trans_release (alpm) < 0) { @@ -1597,7 +1605,7 @@ index 37ade1e..ff83b5e 100644 alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs); diff --git a/configure.ac b/configure.ac -index 37e8a64..2e85f6f 100644 +index 37e8a64..4a33dbd 100644 --- a/configure.ac +++ b/configure.ac @@ -707,9 +707,7 @@ if test x$enable_opkg = xyes; then @@ -1607,7 +1615,7 @@ index 37e8a64..2e85f6f 100644 - AC_CHECK_HEADER([alpm.h], - [], - [AC_MSG_ERROR([No ALPM headers found])]) -+ PKG_CHECK_MODULES(ALPM, libalpm >= 4.1.0) ++ PKG_CHECK_MODULES(ALPM, libalpm >= 8.0.1) fi if test x$enable_poldek = xyes; then diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD index 6bc817065..71deec798 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/pdns-recursor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90828 2013-05-14 12:04:07Z arodseth $ +# $Id: PKGBUILD 90965 2013-05-16 18:09:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Jan Steffens <heftig@archlinux.org> pkgname=pdns-recursor -pkgver=3.5 -pkgrel=2 +pkgver=3.5.1 +pkgrel=1 pkgdesc='PowerDNS recursor' url='https://www.powerdns.com/' license=('GPL') @@ -15,7 +15,7 @@ makedepends=('boost') backup=('etc/powerdns/recursor.conf') source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2" 'pdns-recursor.service') -sha256sums=('02ea398aa0e95ef4c9caf478eb3836598eabcd5c99ccb7e2e7c265d716089549' +sha256sums=('30655996d1963e259d4fc8648184031bf9cb83f64510d0b00539d3ce698b2824' '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9') build() { @@ -30,7 +30,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install - mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf" + mv "$pkgdir/etc/powerdns/recursor.conf-dist" \ + "$pkgdir/etc/powerdns/recursor.conf" rm -r "$pkgdir/etc/init.d" install -Dm644 "$srcdir/pdns-recursor.service" \ "$pkgdir/usr/lib/systemd/system/pdns-recursor.service" diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD index cd5fa8149..ada06ec74 100644 --- a/community/pidgin-libnotify/PKGBUILD +++ b/community/pidgin-libnotify/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pidgin-libnotify pkgver=0.14 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') pkgdesc="pidgin plugin that enables popups when someone logs in or messages you." url="http://gaim-libnotify.sourceforge.net/" @@ -14,22 +14,25 @@ makedepends=('intltool') optdepends=('notification-daemon') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch - pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch) + pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch pidgin-libnotify-getfocus.patch) +md5sums=('bfb5368b69c02d429b2b17c00a6673c0' + 'e9bdbb3c7faa61f062fc64277457b6c0' + '05538625f14d9f2c12adae5fa6a1fa26' + 'efe1e86aa1e0bc9f7d20efe7f34ad4a7' + 'e624998744d1c2fb8e2c6be94b04c38a') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/language_fixes.patch" patch -Np0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" patch -Np0 -i "$srcdir/pidgin-libnotify-showbutton.patch" + patch -Np0 -i "$srcdir/pidgin-libnotify-getfocus.patch" ./configure --prefix=/usr --disable-deprecated --disable-static make } + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('bfb5368b69c02d429b2b17c00a6673c0' - 'e9bdbb3c7faa61f062fc64277457b6c0' - '05538625f14d9f2c12adae5fa6a1fa26' - 'efe1e86aa1e0bc9f7d20efe7f34ad4a7') diff --git a/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch b/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch new file mode 100644 index 000000000..db45829d9 --- /dev/null +++ b/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch @@ -0,0 +1,69 @@ +--- src/pidgin-libnotify.c 2013-05-07 17:38:31.397261982 +0200 ++++ src2/pidgin-libnotify.c 2013-05-07 17:43:43.787904584 +0200 +@@ -169,6 +169,49 @@ pixbuf_from_buddy_icon (PurpleBuddyIcon + return icon; + } + ++/* Taken from pidgin-hotkeys to get focus on conversation window */ ++static void ++hacky_active_window(GtkWidget *window) ++{ ++ GdkScreen *screen; ++ GdkWindow *root; ++ GdkDisplay *display; ++ Display *xdisplay; ++ Window xroot; ++ XEvent xev; ++ static Atom _net_active_window = None; ++ ++ screen = gtk_widget_get_screen(window); ++ root = gdk_screen_get_root_window(screen); ++ display = gdk_screen_get_display(screen); ++ ++ xdisplay = GDK_DISPLAY_XDISPLAY(display); ++ xroot = GDK_WINDOW_XWINDOW(root); ++ ++ if (_net_active_window == None) ++ _net_active_window = XInternAtom(xdisplay, ++ "_NET_ACTIVE_WINDOW", ++ False); ++ ++ xev.xclient.type = ClientMessage; ++ xev.xclient.serial = 0; ++ xev.xclient.send_event = True; ++ xev.xclient.window = GDK_WINDOW_XWINDOW(window->window); ++ xev.xclient.message_type = _net_active_window; ++ xev.xclient.format = 32; ++ xev.xclient.data.l[0] = 1; /* requestor type; we're an app, I guess */ ++ xev.xclient.data.l[1] = CurrentTime; ++ xev.xclient.data.l[2] = None; /* "currently active window", supposedly */ ++ xev.xclient.data.l[3] = 0; ++ xev.xclient.data.l[4] = 0; ++ ++ XSendEvent(xdisplay, ++ xroot, False, ++ SubstructureRedirectMask | SubstructureNotifyMask, ++ &xev); ++} ++ ++ + static void + action_cb (NotifyNotification *notification, + gchar *action, gpointer user_data) +@@ -194,6 +237,16 @@ action_cb (NotifyNotification *notificat + buddy->name); + } + conv->ui_ops->present (conv); ++ ++ /* get the focus on the new conversation window */ ++ { ++ GtkWindow *gtkwindow; ++ ++ gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION(conv))->window); ++ /*gtk_window_present(gtkwindow);*/ ++ hacky_active_window(GTK_WIDGET(gtkwindow)); ++ } ++ + + notify_notification_close (notification, NULL); + } diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD index 34a04f8c1..8c67cdabc 100644 --- a/community/prelink/PKGBUILD +++ b/community/prelink/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 57791 2011-11-02 20:30:29Z lfleischer $ +# $Id: PKGBUILD 90944 2013-05-16 03:44:23Z eric $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> pkgname=prelink pkgver=20111012 -pkgrel=1 +pkgrel=2 pkgdesc='ELF prelinking utility to speed up dynamic linking.' arch=('i686' 'x86_64') url='http://people.redhat.com/jakub/prelink/' license=('GPL') depends=('elfutils') backup=('etc/prelink.conf') -md5sums=('f5aaf347432d677c293e5e3399ba4fdf' - '0793ed49e9b31c125cba4d936c333cf6' - 'b347580536e078b34c547742d36a3e9d') source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2" 'prelink.conf' 'arch-x86_64-dynamic_linker.patch') +md5sums=('f5aaf347432d677c293e5e3399ba4fdf' + '0793ed49e9b31c125cba4d936c333cf6' + 'b347580536e078b34c547742d36a3e9d') -build() { - cd "${srcdir}/${pkgname}" - +prepare() { + cd ${pkgname} patch -Np0 -i ../arch-x86_64-dynamic_linker.patch +} - ./configure --prefix=/usr --mandir=/usr/share/man +build() { + cd ${pkgname} + ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin make } package() { - cd "${srcdir}/${pkgname}" - + cd ${pkgname} make DESTDIR="${pkgdir}" install install -Dm0644 "${srcdir}/prelink.conf" "${pkgdir}/etc/prelink.conf" } diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD deleted file mode 100644 index 14f3af690..000000000 --- a/community/proftpd/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 87017 2013-03-25 19:16:59Z bpiotrowski $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4c -pkgrel=2 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64') -url="http://www.proftpd.org/" -license=('GPL') -depends=('libmariadbclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -install=${pkgname}.install -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service' - 'proftpd.tmpfiles') -md5sums=('65f61e953bea249f8377e681594143a5' - '7f00fb7bf757b4bd795afdf0a3f5e556' - 'c439a0a1dbc21b604d8382da87aa021b' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736' - '5709f27ebcbe906e52963ea75e4fde64' - '907b149a120b046f05647c73502e23c9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/run/proftpd \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls \ - --with-systemd - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - - install -d "${pkgdir}/usr/lib/systemd/system/" - install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" - install -Dm644 "${srcdir}"/proftpd.tmpfiles \ - "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf - - # /run is tmpfs - rmdir "${pkgdir}"/run/{proftpd,} -} diff --git a/community/proftpd/proftpd b/community/proftpd/proftpd deleted file mode 100755 index 9ea1d47fc..000000000 --- a/community/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /run/proftpd/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/community/proftpd/proftpd.conf.d b/community/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/community/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/community/proftpd/proftpd.install b/community/proftpd/proftpd.install deleted file mode 100644 index 6d9888496..000000000 --- a/community/proftpd/proftpd.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - systemd-tmpfiles --create proftpd.conf -} diff --git a/community/proftpd/proftpd.logrotate b/community/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/community/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/community/proftpd/proftpd.service b/community/proftpd/proftpd.service deleted file mode 100644 index a07d17f46..000000000 --- a/community/proftpd/proftpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=ProFTPD FTP Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/proftpd/proftpd.pid -ExecStart=/usr/sbin/proftpd -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy = multi-user.target diff --git a/community/proftpd/proftpd.tmpfiles b/community/proftpd/proftpd.tmpfiles deleted file mode 100644 index 241dc7cb1..000000000 --- a/community/proftpd/proftpd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/proftpd 0755 root root diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index c3100085b..f84a6d362 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84803 2013-02-24 19:02:59Z bpiotrowski $ +# $Id: PKGBUILD 90963 2013-05-16 17:56:17Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 -pkgver=3.16.4.1 -pkgrel=3 +pkgver=3.19.0 +pkgrel=1 pkgdesc='Fast and modern Javascript engine' arch=('i686' 'x86_64') url='http://code.google.com/p/v8' @@ -12,18 +12,18 @@ license=('BSD') depends=('gcc-libs' 'readline') makedepends=('subversion' 'python2') source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2) -sha256sums=('74ab3bc11f6761e5108affcbe15bc673d2ecbe06aa38ea4b27d850321c0fdc2b') +sha256sums=('35af5629792e958968eacc94daef3ad358b6ed7126875db6138664f51c061368') [[ "$CARCH" = 'i686' ]] && ARCH=ia32 [[ "$CARCH" = 'x86_64' ]] && ARCH=x64 -build() { - cd $srcdir/$pkgname-$pkgver +prepare() { + cd $pkgname-$pkgver # Fetch gyp make dependencies - # The world isn't ready for python2 + # The world isn't ready for python3 export PYTHON=python2 find build/ test/ tools/ src/ -type f \ -exec sed -e 's_^#!/usr/bin/env python$_&2_' \ @@ -31,24 +31,28 @@ build() { -e 's_^#!/usr/bin/python$_&2_' \ -e "s_'python'_'python2'_" -i {} \; sed -i 's/python /python2 /' Makefile +} + +build() { + cd $pkgname-$pkgver - make $ARCH.release library=shared console=readline + make $ARCH.release library=shared console=readline werror=no - cd $srcdir && cp -r $pkgname-$pkgver d8-static-$pkgver + cd "$srcdir" && cp -r $pkgname-$pkgver d8-static-$pkgver cd d8-static-$pkgver - make $ARCH.release library=static console=readline + make $ARCH.release library=static console=readline werror=no } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - install -Dm755 $srcdir/d8-static-$pkgver/out/$ARCH.release/d8 $pkgdir/usr/bin/d8 - install -Dm755 out/$ARCH.release/lib.target/libv8.so $pkgdir/usr/lib/libv8.so + install -Dm755 "$srcdir"/d8-static-$pkgver/out/$ARCH.release/d8 "$pkgdir"/usr/bin/d8 + install -Dm755 out/$ARCH.release/lib.target/libv8.so "$pkgdir"/usr/lib/libv8.so - install -d $pkgdir/usr/include - install -Dm644 include/*.h $pkgdir/usr/include + install -d "$pkgdir"/usr/include + install -Dm644 include/*.h "$pkgdir"/usr/include - install -d $pkgdir/usr/share/licenses/v8 + install -d "$pkgdir"/usr/share/licenses/v8 install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8 } diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD index fe78f2aab..1af2efff6 100644 --- a/community/xdelta3/PKGBUILD +++ b/community/xdelta3/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 83184 2013-01-27 16:27:33Z pierre $ +# $Id: PKGBUILD 90967 2013-05-16 19:50:32Z bpiotrowski $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 -pkgver=3.0.6 +pkgver=3.0.7 pkgrel=1 -pkgdesc="A diff utility which works with binary files" +pkgdesc="Diff utility which works with binary files" arch=('i686' 'x86_64') url="http://xdelta.org/" license=('GPL') depends=('xz') source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('652048ab4a7e5f927bce045228a17b31') +md5sums=('ef6631e4f9219a80bcb9e3020962b6ec') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./xdelta3 test } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index 38c9cfc82..a25f1a53b 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,38 +1,40 @@ -# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $ +# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=inetutils pkgver=1.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" license=('GPL3') groups=('base') -depends=('readline' 'ncurses' 'pam') -backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ +depends=('pam') +backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') options=('!emptydirs') install=inetutils.install source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ - ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ + telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ ftpd.service dnsdomainname) sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' - 'ff0aad9946a38915580b094dadf67e790e8a2f87' - '84dc802b5e57b5e04c847572225a3b9612017155' - '68a590083b45997dfdb80e666b2de762f494ba74' - 'bfad98a4a62f1fff8779f076c6019ed07f9111af' - '27d99b910eec0fc26bd79ccc2c1de26608330298' - '81f10b3b688e3952f793b35bcef63b5bf257a92b' - '81f4a8da823cf0bb14284fc71ee6108849691eda' - 'fb607dafe177f074e14891dd887ef9e9ab67a875' + 'SKIP' + '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3' + 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c' + 'd9b8f8aab094ecb779d0f16f21b4683ab327516f' + '26763ae31b8a5be256666a0ba55746941d75d6ee' + 'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802' 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h - ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ - --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --libexec=/usr/bin \ + --localstatedir=/var --sysconfdir=/etc \ --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ @@ -50,20 +52,19 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d "${pkgdir}/bin" - ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" - install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" + ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname" + ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname" + install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname" echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" - install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" - install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" diff --git a/core/inetutils/ftpd.conf b/core/inetutils/ftpd.conf deleted file mode 100644 index f660f0035..000000000 --- a/core/inetutils/ftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="" diff --git a/core/inetutils/ftpd.rc b/core/inetutils/ftpd.rc deleted file mode 100644 index 3d0d34421..000000000 --- a/core/inetutils/ftpd.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ftpd - -PID=$(pidof -o %PPID /usr/sbin/ftpd) -case "$1" in - start) - stat_busy "Starting ftpd" - [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ftpd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service index 5708bdfd1..57549c088 100644 --- a/core/inetutils/ftpd.service +++ b/core/inetutils/ftpd.service @@ -3,7 +3,7 @@ Description=FTPD Daemon After=network.target [Service] -ExecStart=/usr/sbin/ftpd -D +ExecStart=/usr/bin/ftpd -D Type=forking [Install] diff --git a/core/inetutils/inetutils.install b/core/inetutils/inetutils.install index b338fa498..bd2a283b8 100644 --- a/core/inetutils/inetutils.install +++ b/core/inetutils/inetutils.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(inetutils.info.gz) post_install() { diff --git a/core/inetutils/rlogin.xinetd b/core/inetutils/rlogin.xinetd index 5c72f86df..bffdb9011 100644 --- a/core/inetutils/rlogin.xinetd +++ b/core/inetutils/rlogin.xinetd @@ -4,7 +4,7 @@ service login socket_type = stream wait = no user = root - server = /usr/sbin/rlogind + server = /usr/bin/rlogind log_on_failure += USERID disable = yes } diff --git a/core/inetutils/rsh.xinetd b/core/inetutils/rsh.xinetd index a13738c31..c8848ce7f 100644 --- a/core/inetutils/rsh.xinetd +++ b/core/inetutils/rsh.xinetd @@ -4,7 +4,7 @@ service shell socket_type = stream wait = no user = root - server = /usr/sbin/rshd + server = /usr/bin/rshd log_on_failure += USERID disable = yes } diff --git a/core/inetutils/talk.xinetd b/core/inetutils/talk.xinetd index 6abef359c..b62e56310 100644 --- a/core/inetutils/talk.xinetd +++ b/core/inetutils/talk.xinetd @@ -4,7 +4,7 @@ service ntalk socket_type = dgram wait = yes user = root - server = /usr/sbin/talkd + server = /usr/bin/talkd log_on_failure += USERID disable = yes } diff --git a/core/inetutils/telnet.xinetd b/core/inetutils/telnet.xinetd index bd3a5e4b1..c56f33985 100644 --- a/core/inetutils/telnet.xinetd +++ b/core/inetutils/telnet.xinetd @@ -4,7 +4,7 @@ service telnet socket_type = stream wait = no user = root - server = /usr/sbin/telnetd + server = /usr/bin/telnetd log_on_failure += USERID disable = yes } diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index f010b1da0..f2760dfb8 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184326 2013-05-06 09:32:38Z pierre $ +# $Id: PKGBUILD 185626 2013-05-16 13:54:50Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=logrotate pkgver=3.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64') url="https://fedorahosted.org/logrotate/" @@ -21,7 +21,7 @@ md5sums=('7be7f1eabea33a1d0483438a6e33d634' 'cd76976b5ce37d328b452c806b55a015' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' - 'aa8ac8283908b6114483a293adcb650f') + '3909380f8a55fa160f62ed976a8bef4b') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -40,7 +40,9 @@ check() { package() { cd "$srcdir/${pkgname}-${pkgver}" make PREFIX="$pkgdir" MANDIR="/usr/share/man" install + mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin + install -dm755 "$pkgdir/etc/logrotate.d" install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" } diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily index ee0eeeb48..37d9e534c 100755 --- a/core/logrotate/logrotate.cron.daily +++ b/core/logrotate/logrotate.cron.daily @@ -9,16 +9,16 @@ IONICE_CLASS=2 # 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest IONICE_PRIORITY=7 -CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf" - +CMD_LOGROTATE="/usr/bin/logrotate /etc/logrotate.conf" + if [ -x /usr/bin/nice ]; then CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}" fi - + if [ -x /usr/bin/ionice ]; then CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" fi - + ${CMD_LOGROTATE} - + exit 0 diff --git a/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch b/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch new file mode 100644 index 000000000..26da877ef --- /dev/null +++ b/core/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch @@ -0,0 +1,57 @@ +From e3b6cb87e0ba1304fa07ec316784de1c6243b28e Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Mon, 13 May 2013 10:54:41 +0200 +Subject: [PATCH] lib/loopdev: fix loopcxt_check_size() to work with blkdevs + +The loopcxt_check_size() is workaround for kernels < v3.9, kernel has +been fixed by commit 541c742a7559eb65f0e36d3e2338c2ca532a3e61. + +The function sets loopdev size according to backing file size. The +problem is that the backing file could be a block device where +stat.st_size is zero, so we have to use blkdev_get_size() for block +devices. + +Addresses: https://bugs.archlinux.org/task/35193 +Reported-by: Dave Reisner <d@falconindy.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + lib/loopdev.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/lib/loopdev.c b/lib/loopdev.c +index c35e306..3b65b5d 100644 +--- a/lib/loopdev.c ++++ b/lib/loopdev.c +@@ -1097,7 +1097,17 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd) + if (fstat(file_fd, &st)) + return -errno; + +- expected_size = st.st_size; ++ if (S_ISBLK(st.st_mode)) { ++ if (blkdev_get_size(file_fd, ++ (unsigned long long *) &expected_size)) ++ return -errno; ++ } else ++ expected_size = st.st_size; ++ ++ if (expected_size == 0 || expected_size <= lc->info.lo_offset) { ++ DBG(lc, loopdev_debug("failed to determine expected size")); ++ return 0; /* ignore this error */ ++ } + + if (lc->info.lo_offset > 0) + expected_size -= lc->info.lo_offset; +@@ -1113,6 +1123,10 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd) + return -errno; + + if (expected_size != size) { ++ DBG(lc, loopdev_debug("warning: loopdev and expected " ++ "size dismatch (%ju/%ju)", ++ size, expected_size)); ++ + if (loopcxt_set_capacity(lc)) { + /* ioctl not available */ + if (errno == ENOTTY || errno == EINVAL) +-- +1.8.2.3 + diff --git a/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch b/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch new file mode 100644 index 000000000..afc875719 --- /dev/null +++ b/core/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch @@ -0,0 +1,26 @@ +From b048b8af3a5568c90f6e0c2d56f6cb399dedb0d1 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Mon, 13 May 2013 11:00:47 +0200 +Subject: [PATCH] losetup: use warn_size() for regular files only + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/losetup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c +index ccf120e..b44c9e5 100644 +--- a/sys-utils/losetup.c ++++ b/sys-utils/losetup.c +@@ -380,7 +380,7 @@ static void warn_size(const char *filename, uint64_t size) + struct stat st; + + if (!size) { +- if (stat(filename, &st)) ++ if (stat(filename, &st) || S_ISBLK(st.st_mode)) + return; + size = st.st_size; + } +-- +1.8.2.3 + diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 3894784c6..77b94f1a8 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184217 2013-05-03 23:40:29Z dreisner $ +# $Id: PKGBUILD 185607 2013-05-15 22:53:31Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.23 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -13,10 +13,12 @@ depends=('pam' 'shadow' 'coreutils' 'glibc') makedepends=('systemd') # checkdepends=('bc') conflicts=('util-linux-ng' 'eject') -provides=("util-linux-ng=${pkgver}" 'eject') +provides=("util-linux-ng=$pkgver" 'eject') license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.23/${pkgname}-${pkgver}.tar.xz +source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz" + 0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch + 0001-losetup-use-warn_size-for-regular-files-only.patch uuidd.tmpfiles pam-login pam-common @@ -27,9 +29,23 @@ backup=(etc/pam.d/chfn etc/pam.d/su etc/pam.d/su-l) install=util-linux.install +md5sums=('cf5e9bb402371beaaffc3a5f276d5783' + 'fdb627fbb3d6a42e0b36978649b4c064' + 'de0ba450945a60f27c5df86e64523d57' + 'a39554bfd65cccfd8254bb46922f4a67' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad') + +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir"/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch + patch -Np1 <"$srcdir"/0001-losetup-use-warn_size-for-regular-files-only.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -76,8 +92,3 @@ package() { # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('cf5e9bb402371beaaffc3a5f276d5783' - 'a39554bfd65cccfd8254bb46922f4a67' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 9aedff0fd..1f255b672 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $ +# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.7.0 -pkgrel=4 +pkgver=2.7.1 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org/" @@ -23,7 +23,7 @@ optdepends=("libgpod: support for Apple iPod audio devices" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e') +sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d') build() { mkdir build diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 5eacb4ffe..834de04cf 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184840 2013-05-09 09:27:18Z ronald $ +# $Id: PKGBUILD 185677 2013-05-16 20:58:57Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('94d839f5f198e82794e7cfeb174d42178c75c2e3') +sha1sums=('f13e9c3bcd4823920cdf3bacbd2c03a1935399a1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 44c1d9eba..08857c145 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184994 2013-05-09 17:25:25Z ronald $ +# $Id: PKGBUILD 185669 2013-05-16 20:56:13Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b7be13256b1cc91636127b167a83af2980f5a302') +sha1sums=('8ee61a186f2a41477415d78af4475e8a05132920') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 86eae8b20..ddf2dfbb8 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184836 2013-05-09 09:26:01Z ronald $ +# $Id: PKGBUILD 185673 2013-05-16 20:57:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('742080922ab71a76d157058ea01e603b577c12bc') +sha1sums=('cad21ed849b09d1436bebe3742e058177bc26a8b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index 74a42c812..e63bf7573 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184829 2013-05-09 09:23:48Z ronald $ +# $Id: PKGBUILD 185666 2013-05-16 20:55:11Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b027777c723d199da665a2c32204d9b9f406bf5a') +sha1sums=('d3f756321147b26c89b69ece8c6115ba0f68490e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index 8e5ff25fd..1f1c37e4b 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184834 2013-05-09 09:25:29Z ronald $ +# $Id: PKGBUILD 185671 2013-05-16 20:56:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('e7087e2068fb9fd4a2e8dc9d006adce69cc97406') +sha1sums=('45b2920b059baa80a2ccf93320751139045e6a72') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index c863fb36e..2229cc2eb 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184839 2013-05-09 09:27:01Z ronald $ +# $Id: PKGBUILD 185676 2013-05-16 20:58:32Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1c561497372c5b4c61074789c738b6d62bc9e5d0') +sha1sums=('df466e60825b24d9c0eb1dbac5f688f884e58404') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 77307b497..a9d9c0885 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184828 2013-05-09 09:23:29Z ronald $ +# $Id: PKGBUILD 185665 2013-05-16 20:54:50Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('725667ed0448d27b63b76189267f8711fcdfaa2e') +sha1sums=('74260d239cdf1f7da1f0ab106fb144fa23d74a87') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index 6475c226d..28ad9a4fd 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184833 2013-05-09 09:25:14Z ronald $ +# $Id: PKGBUILD 185670 2013-05-16 20:56:37Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('4660797bd87b0ba8c1285cbcb173aceaeb93f9e4') +sha1sums=('1c1bf133496de65c35a19319988796c9913d1d42') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index 88946b9f4..4503d6e22 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184841 2013-05-09 09:27:34Z ronald $ +# $Id: PKGBUILD 185678 2013-05-16 20:59:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('26df183adac7a3572f04e6a8fcb8be38010b203a') +sha1sums=('1a4dbc727780eff95c102cd8ecf9533c07a3631d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index df89b16ca..197de93f9 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184835 2013-05-09 09:25:45Z ronald $ +# $Id: PKGBUILD 185672 2013-05-16 20:57:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0d70796cd78b8ad9ed308193becdbb94dad5e51c') +sha1sums=('204fa38463b64d3b97e4c598942e9389dc89216e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index 4b344ee78..1f8c515b3 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184837 2013-05-09 09:26:25Z ronald $ +# $Id: PKGBUILD 185674 2013-05-16 20:57:59Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('32b9d991cb33a7c1b96ad47b3c676238cdd278b7') +sha1sums=('e42b73a268afaa022efb179966991cfb3865168b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 7d16f8f9b..a91029fd6 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184843 2013-05-09 09:30:22Z ronald $ +# $Id: PKGBUILD 185679 2013-05-16 21:02:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.2.1 +pkgver=0.17.3 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('5122a2b62d151d11b28457bd3626130e9c5bcc3c' +sha1sums=('998a5ada3861028ffd65f994270e5f7f8e9baf9b' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index cd481168c..e40c66688 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184838 2013-05-09 09:26:45Z ronald $ +# $Id: PKGBUILD 185675 2013-05-16 20:58:16Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7917215aead3aaef9fd20c141759b1cc17ec5c19') +sha1sums=('37d173fea2ce68ee1cedd379f235663c1211d20d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 3cc2da55f..2e8e8f63f 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185003 2013-05-09 20:12:12Z ronald $ +# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('76b9b7338ae2a16fca25d6183355d425d4595594') +sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index bdf9fb7cc..4d9394789 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184830 2013-05-09 09:24:04Z ronald $ +# $Id: PKGBUILD 185667 2013-05-16 20:55:27Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('6f3d6a0fd888f39d941436ff3e48d86981e9f636') +sha1sums=('f4c753e995a7adb5e18535f41446e222f19227c2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index cc5f6f1c4..477015cde 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 185301 2013-05-13 04:58:41Z heftig $ +# $Id: PKGBUILD 185633 2013-05-16 14:54:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.8.2 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64') license=('GPL') depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite') makedepends=('intltool' 'itstool' 'gobject-introspection') +optdepends=('gnuchess: Play against computer') conflicts=('gnome-games') replaces=('gnome-games') options=('!emptydirs' '!libtool') @@ -17,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('282e788407603b9619290ecfe5b8a717463dbb17c89dd38aeefdd4b19561bbb3') +sha256sums=('d38cf534eeeffa4db81edf9db92c0c188d5ffd52cd7091352a0972b2b5c655cb') build() { cd $pkgname-$pkgver diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index f48b083b5..719906d43 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184760 2013-05-07 23:25:13Z tomegun $ +# $Id: PKGBUILD 185608 2013-05-15 22:56:58Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=gpsd pkgver=3.9 -pkgrel=1 +pkgrel=2 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') url="http://catb.org/gpsd/" @@ -73,6 +73,11 @@ package() { install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # move to /usr/bin + sed -i -e 's,/usr/sbin,/usr/bin,g' "${pkgdir}/usr/lib/systemd/system/gpsd.service" + mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" + rm -r "${pkgdir}/usr/sbin" } md5sums=('53a88f24a0973d23427e82e9a8914f19' 'SKIP' diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 4fe44da7c..5a57c338c 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183412 2013-04-21 22:10:47Z heftig $ +# $Id: PKGBUILD 185629 2013-05-16 14:07:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" @@ -22,7 +22,7 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('029ea7fdbb32ff5cc20295b9a1a943f76f39a67ed5bf08a2b33b01cf287a1227') +sha256sums=('0495a9717189049c16c96b51a2aad6dd348c11e82be243a9a7b65ea68507af3e') build() { cd $pkgname-$pkgver diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index 49640bb9c..d6a43768d 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 180276 2013-03-19 13:37:31Z jgc $ +# $Id: PKGBUILD 185628 2013-05-16 14:06:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.5 +pkgver=0.2.6 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') -depends=('gtk3' 'libxml2' 'libsoup') -makedepends=('gobject-introspection' 'gtk-doc' 'vala') +depends=('gtk3' 'libxml2' 'libsoup' 'liboauth') +makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ff281f60bc3afcb70913e61a6447b33ab259b3d89c1441c7e307fc998c050cdc') +sha256sums=('601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 04ef0a6a2..bbc09d657 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183426 2013-04-21 22:11:10Z heftig $ +# $Id: PKGBUILD 185652 2013-05-16 19:22:22Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.3 -pkgrel=2 +pkgver=0.12.4 +pkgrel=1 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" license=('LGPL') @@ -13,7 +13,7 @@ options=('!libtool') depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658') +sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493') build() { cd $pkgname-$pkgver diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index bca90c592..95b103c05 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185211 2013-05-12 07:33:11Z eric $ +# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -48,6 +48,7 @@ package_msmtp-mta() { provides=('smtp-forwarder') conflicts=('smtp-forwarder') - install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}"/usr/{s,}bin ln -s msmtp "${pkgdir}/usr/bin/sendmail" + ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail" } diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 799766095..0ad18ea79 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $ +# $Id: PKGBUILD 185631 2013-05-16 14:46:08Z bpiotrowski $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.022 -pkgrel=3 +pkgver=4.023 +pkgrel=1 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -14,10 +14,10 @@ depends=('libmariadbclient' 'perl-dbi') makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('20fb571245e3b9ac275b8329025c4bf6') +md5sums=('6ee956cf33ddce6441b36b6c1c983528') build() { - cd "${srcdir}/${_realname}-${pkgver}" + cd $_realname-$pkgver # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql @@ -25,7 +25,7 @@ build() { } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd $_realname-$pkgver mkdir -p /tmp/mysql_test mysql_install_db \ --basedir=/usr \ @@ -40,6 +40,6 @@ check() { } package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" + cd $_realname-$pkgver + make install DESTDIR="$pkgdir" } diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD index 2212b5dec..1bf7449bd 100644 --- a/extra/thinkfinger/PKGBUILD +++ b/extra/thinkfinger/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158572 2012-05-04 23:57:24Z allan $ +# $Id: PKGBUILD 185609 2013-05-15 22:56:59Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: François Charette <francois.archlinux.org> # Contributor: Damir Perisa <damir.archlinux.org> @@ -6,13 +6,12 @@ pkgname=thinkfinger pkgver=0.3 -pkgrel=6 +pkgrel=7 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads" url="http://thinkfinger.sourceforge.net/" arch=('i686' 'x86_64') license=("GPL") depends=('pam' 'libusb-compat') -install=thinkfinger.install options=('!libtool' 'emptydirs') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'thinkfinger-uinput-hack.patch' @@ -22,7 +21,7 @@ md5sums=('588565233bcbea5ff0a7f5314361c380' '93c80f342329a5bd40f5f324fe670225') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580 patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch @@ -30,12 +29,13 @@ build() { patch -p1 -i "${srcdir}"/gcc46.patch ./configure --prefix=/usr \ - --with-birdir=/etc/pam_thinkfinger + --sbindir=/usr/bin \ + --with-birdir=/etc/pam_thinkfinger make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # create dir to store fingerprints install -d $pkgdir/etc/pam_thinkfinger diff --git a/extra/thinkfinger/thinkfinger.install b/extra/thinkfinger/thinkfinger.install deleted file mode 100644 index bb1f6dde0..000000000 --- a/extra/thinkfinger/thinkfinger.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "==> To use thinkfinger, add 'uinput' to the MODULES=() in /etc/rc.conf." - echo " More Infos: http://wiki.archlinux.org/index.php/Thinkfinger" -} diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 81b5020df..d058ce54a 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172088 2012-11-27 19:16:47Z dreisner $ +# $Id: PKGBUILD 185610 2013-05-15 22:57:00Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> pkgname=udisks pkgver=1.0.4 -pkgrel=6 +pkgrel=7 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -32,6 +32,10 @@ package() { mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ rm -r "${pkgdir}"/lib + # move umount helper to /usr/bin + mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/ + rm -r "${pkgdir}"/sbin + install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" echo "SystemdService=udisks.service" \ >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index 56ade6c6c..c2bbc1c08 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $ +# $Id: PKGBUILD 185611 2013-05-15 22:57:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,13 +6,13 @@ pkgname=ypbind-mt pkgver=1.37.1 -pkgrel=4 +pkgrel=5 pkgdesc='Linux NIS daemon' url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') arch=('i686' 'x86_64') makedepends=('networkmanager') -depends=('rpcbind' 'openslp' 'yp-tools') +depends=('rpcbind' 'openslp' 'yp-tools' 'systemd') backup=('etc/yp.conf') source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'ypbind.service') @@ -21,7 +21,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ - --prefix=/usr + --prefix=/usr \ + --sbindir=/usr/bin make } @@ -36,4 +37,4 @@ package() { install -d -m755 "${pkgdir}"/var/yp/binding } md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82' - '9083debd16fc49c6645372caa25969b5') + '5ea205756731c2978cca4934141424bd') diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service index 08e4fe14e..bb13f1d66 100644 --- a/extra/ypbind-mt/ypbind.service +++ b/extra/ypbind-mt/ypbind.service @@ -7,7 +7,7 @@ Before=systemd-user-sessions.service [Service] Type=forking PIDFile=/run/ypbind.pid -ExecStart=/usr/sbin/ypbind +ExecStart=/usr/bin/ypbind # Terrible hack, upstream ypbind should sort something out # Wait for at most 10 seconds for a NIS master to become available ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done" diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index 879df8781..98420b735 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184215 2013-05-03 22:54:49Z tomegun $ +# $Id: PKGBUILD 185612 2013-05-15 22:57:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=ypserv pkgver=2.31 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/ypserv/' @@ -21,7 +21,7 @@ source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.b build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -37,6 +37,6 @@ package() { install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service } md5sums=('4537b8f0e917edca8f57b70b9cbc37f3' - 'c80e253756446d59a90c4c21b1cb8740' - '7cba3dd3544436c3c1f05e36c0018e92' - '3398271c3e0a054e64b06b99aa2dc63d') + '0639cc2e8f667272335649eeede77206' + '9ff147310a5b83749357b6587cccdf34' + '89b8b608c81fd01bb81cdb551854833f') diff --git a/extra/ypserv/yppasswdd.service b/extra/ypserv/yppasswdd.service index 9a7068b6c..371a7d481 100644 --- a/extra/ypserv/yppasswdd.service +++ b/extra/ypserv/yppasswdd.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/yppasswdd.pid -ExecStart=/usr/sbin/rpc.yppasswdd +ExecStart=/usr/bin/rpc.yppasswdd [Install] WantedBy=multi-user.target diff --git a/extra/ypserv/ypserv.service b/extra/ypserv/ypserv.service index 024a92e5a..8aa6b2a24 100644 --- a/extra/ypserv/ypserv.service +++ b/extra/ypserv/ypserv.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/ypserv.pid -ExecStart=/usr/sbin/ypserv +ExecStart=/usr/bin/ypserv [Install] WantedBy=multi-user.target diff --git a/extra/ypserv/ypxfrd.service b/extra/ypserv/ypxfrd.service index 322ef559f..c7bb6ed87 100644 --- a/extra/ypserv/ypxfrd.service +++ b/extra/ypserv/ypxfrd.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/ypxfrd.pid -ExecStart=/usr/sbin/rpc.ypxfrd +ExecStart=/usr/bin/rpc.ypxfrd [Install] WantedBy=multi-user.target diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD index 2bd99940e..3f8e5071d 100755 --- a/java-ugly/maven/PKGBUILD +++ b/java-ugly/maven/PKGBUILD @@ -2,51 +2,72 @@ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> -_pkgname=maven -pkgname=maven-libre -pkgver=3.0.4 +pkgname=maven +pkgver=3.0.5 +pkgdesc="A Java project management and project comprehension tool" +url="http://maven.apache.org" +license=('Apache') -provides=("$_pkgname=$pkgver") -replaces=("$_pkgname") -conflicts=("$_pkgname") +replaces=('maven-libre') +conflicts=('maven-libre') pkgrel=1 -pkgdesc="A Java project management and project comprehension tool" arch=('any') -url="http://maven.apache.org" -license=('Apache') -depends=('java-environment') -makedepends=('apache-ant') +options=(!emptydirs) +conflicts=('maven') +depends=('java-environment' 'sh') +makedepends=('apache-ant' 'jh' 'imake' + java-antlr2 + java-asm3 +) backup=('etc/maven/settings.xml') _mirror=http://archive.apache.org/dist -source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz +source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz maven.sh maven.csh) -_M2_LOCALREPO="/usr/share/maven/repository" - -# FIXME: This also does tasks for package() -build() { - cd $srcdir/apache-maven-$pkgver - +_setup_env() { + unset _JAVA_OPTIONS . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - export MAVEN_OPTS=-Xmx512m export M2_HOME="$pkgdir"/opt/maven export PATH="$PATH:$M2_HOME/bin" + _M2_LOCALREPO=$(jh mvn-localrepo) + ant_args=( + -Dmaven.repo.local="$srcdir"/maven.repo.local + ) +} - # FIXME: Downloads many deps from Internet. They should be - # packaged separately and added to depends=() - install -d "$pkgdir`dirname $_M2_LOCALREPO`" - cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO" - install -d "$pkgdir"/opt - ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO" - rm "$pkgdir"/opt/maven/*.txt +prepare() { + if type mvn &>/dev/null; then + error "maven cannot be built while an existing version is installed" + return 1 + fi } -package() { - install -d "$pkgdir$_M2_LOCALREPO" +build() ( + _setup_env + install -d "$srcdir"/maven.repo.local + lndir "$_M2_LOCALREPO" "$srcdir"/maven.repo.local + + cd "$srcdir"/apache-maven-$pkgver + + # FIXME: downloads makedepends from the Internet. Add them to makedepends=() + ant "${ant_args[@]}" maven-assembly 2>&1|tee "$srcdir"/ant-log.txt + + < "$srcdir"/ant-log.txt \ + sed -nr 's/.*Download(ed|ing):\s*//p' | \ + sed 's/ .*//' | \ + sed -r -e 's|^http://repo.maven.apache.org/maven2/||' -e 's/\.(jar|pom)$//' | \ + sort -u > "$srcdir"/downloaded-artifacts.txt +) + +package() ( + _setup_env + cd "$srcdir"/apache-maven-$pkgver + ant "${ant_args[@]}" extract-assembly + #rm "$pkgdir"/opt/maven/*.txt # Install config file in /etc # Unlike the other directories, we symlink from the system to /opt/maven @@ -69,8 +90,18 @@ package() { # Link jar files to appropriate place in /usr/share install -d "$pkgdir"/usr/share/java ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven -} -md5sums=('17ca94d5be05a78c6ab12425b7a0ee10' + # Install the local repo + mkdir -p "$pkgdir"${_M2_LOCALREPO%/*} + cp -a "$srcdir"/maven.repo.local "$pkgdir"$_M2_LOCALREPO + # Remove extra artifacts + find "$pkgdir"$_M2_LOCALREPO -type l -delete + find "$pkgdir"$_M2_LOCALREPO -name _maven.repositories -delete + cat "$srcdir"/downloaded-artifacts.txt | while read artifact; do + rm -f "$pkgdir"$_M2_LOCALREPO/$artifact* + done +) + +md5sums=('b88becd8fe5a9665191e05945942db64' '58820067a4d7384477daa134023d9b57' 'e2bbdeffed100cd51d05b2ba8ebd6321') diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD new file mode 100644 index 000000000..4269d30c7 --- /dev/null +++ b/java/antlr2/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: George Giorgidze <giorgidze (at) gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> + +pkgbase=antlr2 +pkgname=(antlr2 antlr2-{java,python2,cxx,sharp}) +pkgver=2.7.7 +url="http://www.antlr2.org/" +license=('custom:Public Domain') + +pkgrel=3 +arch=('i686' 'x86_64') +makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh') +source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" + "http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom" + 'runantlr2.sh' 'gcc4.4.patch' 'mono.patch') + +build() { + cd "${srcdir}/antlr-${pkgver}" + + patch -Np1 -i "${srcdir}"/gcc4.4.patch + patch -Np1 -i "${srcdir}"/mono.patch + + ./configure --prefix=/usr --disable-examples + make -j1 + + cd lib/csharp + nant release +} + +_install_license() { + install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_antlr2() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)" + depends=('sh' 'antlr2-java') + + install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2 + _install_license +} + +package_antlr2-java() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)" + depends=('java-runtime') + + provides=("java-antlr2=$pkgver") + conflicts=("java-antlr2") + replaces=("java-antlr2") + + DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \ + "$srcdir"/antlr-${pkgver}.pom \ + "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \ + antlr2.jar + + _install_license +} + +package_antlr2-python2() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)" + depends=('antlr2' 'python2') + + provides=("python2-antlr2=$pkgver") + conflicts=("python2-antlr2") + replaces=("python2-antlr2") + + cd "$srcdir"/antlr-${pkgver}/lib/python + python2 setup.py install --root="${pkgdir}" --optimize=1 + + _install_license +} + +package_antlr2-cxx() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)" + depends=('java-runtime') + + cd "$srcdir"/antlr-${pkgver}/lib/cpp + make -j1 prefix="${pkgdir}/usr" install + + _install_license +} + +package_antlr2-sharp() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)" + depends=('antlr2' 'mono') + + cd "$srcdir"/antlr-${pkgver}/lib/csharp + install -d "$pkgdir"/usr/share + make -j1 prefix="${pkgdir}/usr" install + + _install_license +} + +md5sums=('01cc9a2a454dd33dcd8c856ec89af090' + '78af3de823003f6d8dded39c70bc30ae' + 'e4aa827cf78f97c4e5fae086831192d6' + '158677e4c0f357afbb56656231a54815' + '0d1960d27ff81f2fea0dd35a8290216f') diff --git a/java/antlr2/gcc4.4.patch b/java/antlr2/gcc4.4.patch new file mode 100644 index 000000000..15e25fb00 --- /dev/null +++ b/java/antlr2/gcc4.4.patch @@ -0,0 +1,12 @@ +diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp ++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +@@ -10,6 +10,8 @@ + + #include <antlr/config.hpp> + ++#include <cstdio> ++#include <cstring> + #include <map> + + #ifdef HAS_NOT_CCTYPE_H diff --git a/java/antlr2/mono.patch b/java/antlr2/mono.patch new file mode 100644 index 000000000..59c78d811 --- /dev/null +++ b/java/antlr2/mono.patch @@ -0,0 +1,31 @@ +diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build +--- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build 2006-11-01 16:37:17.000000000 -0500 ++++ antlr-2.7.7/lib/csharp/antlr.runtime.build 2013-05-14 20:07:32.000000000 -0400 +@@ -25,6 +25,9 @@ + + <!-- Use script task to get this from AssemblyInfo.cs using a regular expression --> + <script language="C#"> ++ <imports> ++ <import namespace="System.Text.RegularExpressions" /> ++ </imports> + <code><![CDATA[ + public static void ScriptMain(Project project) { + string assemblyInfoFileName = Path.Combine(project.BaseDirectory, "antlr.runtime/AssemblyInfo.cs"); +@@ -122,7 +125,7 @@ + </csc> + + <!-- copy the antlr.runtime assembly to the astframe build folder --> +- <copy file="${compile.dir}\${project.FileName}.dll" tofile="${astframe.compile.dir}\${project.FileName}.dll" /> ++ <copy file="${compile.dir}/${project.FileName}.dll" tofile="${astframe.compile.dir}/${project.FileName}.dll" /> + + <!-- compile antlr.astframe.dll --> + <csc target="library" output="${astframe.compile.dir}/${astframe.FileName}.dll" debug="${debug}" doc="${astframe.build.dir}/${astframe.FileName}.xml"> +@@ -134,7 +137,7 @@ + <include name="System.dll" /> + <include name="System.Drawing.dll" /> + <include name="System.Windows.Forms.dll" /> +- <include name="${astframe.compile.dir}\${project.FileName}.dll" /> ++ <include name="${astframe.compile.dir}/${project.FileName}.dll" /> + </references> + <arg value="/nowarn:1591"/> + </csc> diff --git a/java/antlr2/runantlr2.sh b/java/antlr2/runantlr2.sh new file mode 100644 index 000000000..716f6f887 --- /dev/null +++ b/java/antlr2/runantlr2.sh @@ -0,0 +1,5 @@ +#!/bin/sh +echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable +export CLASSPATH +CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar +java antlr.Tool $* diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD index 3541c20ab..71bc0f303 100644 --- a/java/java-asm2/PKGBUILD +++ b/java/java-asm2/PKGBUILD @@ -5,8 +5,7 @@ pkgver=2.2.3 #### -pkgrel=5 -_checksource_ignore=('test/conform/org/objectweb/asm/signature/signatures.txt') +pkgrel=6 mksource() { cd "$srcdir/$_pkgname-$pkgver" @@ -15,4 +14,5 @@ mksource() { mkdir -p test/lib } -md5sums=('7a92c87bf067925685cf68dcc0dd8998') +mkmd5sums=('7a92c87bf067925685cf68dcc0dd8998') +md5sums=('c2119ab39618cb49ca4e4ad74344b488') diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap index 9e896a90e..cbe29bb34 100644 --- a/java/java-asm2/PKGBUILD-bootstrap +++ b/java/java-asm2/PKGBUILD-bootstrap @@ -7,6 +7,7 @@ makedepends=(jh) source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip") +unset mksource _distdir="$_pkgname-$pkgver" provides+=("$pkgname=$pkgver") diff --git a/java/java-asm2/common.sh b/java/java-asm2/common.sh index 6a664c9ff..ef4547696 100644 --- a/java/java-asm2/common.sh +++ b/java/java-asm2/common.sh @@ -13,21 +13,21 @@ makedepends=( java-ow-util-ant-tasks jh ) -source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") +source=("libre://$pkgname-$pkgver.tar.gz") +mksource=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") _distdir="$_pkgname-$pkgver/output/dist" _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' build() { cd "$srcdir/$_pkgname-$pkgver" - eval `jh mksource ${_checksource_ignore[@]}` echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties ant dist # This will make package() easier: cd "$srcdir/$_distdir/lib" - ln -s all/* . + ln -sf all/* . } package() { @@ -48,12 +48,18 @@ package() { # Install Maven artifacts export DESTDIR=$pkgdir - for artifact in $(ls *.jar|sed 's/-[0-9.]*\.jar$//'); do - jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom} - # Symlink them to /usr/share/java - ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \ + for artifact in $(printf '%s\n' *.pom|sed 's/-[0-9.]*\.pom$//'); do + if [[ -f $artifact-$pkgver.jar ]]; then + # This artifact has a jar file + jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{pom,jar} + # Symlink them to /usr/share/java + ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \ "$pkgdir"/usr/share/java/$_pkgname/ - ln -s $_pkgname/$artifact-$pkgver.jar \ + ln -s $_pkgname/$artifact-$pkgver.jar \ "$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar + else + # This artifact is just a pom + jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.pom + fi done } diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD index e85896b72..345c83edf 100644 --- a/java/java-asm3/PKGBUILD +++ b/java/java-asm3/PKGBUILD @@ -5,8 +5,7 @@ pkgver=3.3.1 #### -pkgrel=5 -_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz) +pkgrel=6 mksource() { cd "$srcdir/$_pkgname-$pkgver" @@ -14,4 +13,5 @@ mksource() { rm examples/jasmin/test/jasmin.jar } -md5sums=('433024df8176f09922646316e415631c') +mkmd5sums=('433024df8176f09922646316e415631c') +md5sums=('c49fb45629cf8670b7f46b95013141cd') diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD index f1add43ea..71c5fae94 100644 --- a/java/java-ow-util-ant-tasks/PKGBUILD +++ b/java/java-ow-util-ant-tasks/PKGBUILD @@ -2,14 +2,29 @@ pkgname=java-ow-util-ant-tasks pkgver=1.3.2 -pkgrel=1 pkgdesc="ObjectWeb utility Ant tasks library" -arch=('any') url="http://forge.ow2.org/projects/monolog" license=('LGPL') + +pkgrel=3 +arch=('any') depends=('java-environment') makedepends=('apache-ant' 'xalan-java' 'java-asm2') -source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz") + +source=("libre://$pkgname-$pkgver.tar.gz") +md5sums=('f64b2aeac98508ac322a6509ba754425') + +mksource=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip") +mknoextract=("ow_util_ant_tasks_$pkgver.zip") +mkmd5sums=('cd602bf75a0feab480fa97739955b84e') +mksource() { + cd "$srcdir" + mkdir $pkgname-$pkgver + cd $pkgname-$pkgver + bsdtar xf ../ow_util_ant_tasks_$pkgver.zip + rm -rf output + rm externals/* +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,4 +39,3 @@ package() { install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java } -md5sums=('339b3eb4b2960473a42f5f781afbeca6') diff --git a/java/java-ow-util-ant-tasks/SRCBUILD b/java/java-ow-util-ant-tasks/SRCBUILD deleted file mode 100644 index 01241907d..000000000 --- a/java/java-ow-util-ant-tasks/SRCBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=java-ow-util-ant-tasks -pkgver=1.3.2 -pkgrel=1 -pkgdesc="ObjectWeb utility Ant tasks library" -arch=('any') -url="http://forge.ow2.org/projects/monolog" -license=('LGPL') -source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip") -noextract=("ow_util_ant_tasks_$pkgver.zip") - -build() { - cd "$srcdir" - mkdir $pkgname-$pkgver - cd $pkgname-$pkgver - bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip - rm -rf output - rm externals/* -} - - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/" -} - -md5sums=('cd602bf75a0feab480fa97739955b84e') diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD index 3f01ed7d0..4c1dee6f3 100644 --- a/java/jh/PKGBUILD +++ b/java/jh/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=jh -pkgver=0.4 +pkgver=0.5 pkgdesc="Java helpers for PKGBUILDs" url="https://projects.parabolagnulinux.org/packages/jh.git/" license=('custom:WTFPL') @@ -24,4 +24,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums=('8982b5a25a802e6004a0c20f96a1f185') +md5sums=('5fe2279fbada213eb8df38875450c4d2') diff --git a/java/nant/PKGBUILD b/java/nant/PKGBUILD new file mode 100644 index 000000000..02d9908a6 --- /dev/null +++ b/java/nant/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +pkgname=nant +pkgver=0.92 +pkgrel=1 +pkgdesc="A free .NET build tool" +arch=('i686' 'x86_64') +url="http://nant.sourceforge.net" +license=("GPL2") +depends=('mono-basic') +makedepends=('pkgconfig') +source=("http://downloads.sourceforge.net/nant/$pkgname-$pkgver-src.tar.gz") + +package() { + cd "$srcdir"/$pkgname-$pkgver + make -j1 install prefix=/usr DESTDIR="$pkgdir" +} + +md5sums=('d680b47f9b2ce197cec0fac7d7d60950') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 4ca4fc704..d89e4d1ae 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 7665de2..4588f4a 100644
+index b08f8ce..446ee74 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun()
+@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c35b83600..774d80f92 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=20.0 +_debver=21.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=5 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -30,7 +30,7 @@ license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -options=(!emptydirs) +options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) @@ -50,19 +50,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel-install-dir.patch vendor.js shared-libs.patch - replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('22daa24b6490c654f131550cbf20fad3' - '0c70ab52f35701558081df3d360361a2' - 'a65f285d20e11e650f7220b9c7f2bbf2' +md5sums=('0a7c51bb494463c327af918bae6c4ee4' + 'c17121a4ffd40f463e16d7828445d96e' + 'e1e903ca91997f18b428c54ef604f27d' '383e8e2a97a8b13fe56d153adb6878b6' - 'ea7fec9c58670aae945c0f472471cdff' + '1c6b47e2123c684c1da1e08bd0a107d9' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' - '0c26941504d3f2abed759221e9bb5de1' + 'e7e915720aaf6883ab4b706fe2195dda' '52e52f840a49eb1d14be1c0065b03a93' - '3bf8aefb861095caa45649c118163454' - 'd0e1f2625cd9f7234abdeb55aee00529') + '85e67561e0e491cd538ce018dfc2d948') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -86,17 +84,6 @@ prepare() { patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/shared-libs.patch" - # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do - if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" - grep -Erl "${moz_url}" \ - --exclude='*.'{patch,orig,rej} \ - --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g" - fi - done - # Patch anything that's left patch -Np1 -i "$srcdir/libre.patch" @@ -151,27 +138,22 @@ build() { export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS if $_pgo; then - # Enable PGO export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - make -f client.mk build MOZ_PGO=1 || _fail=1 - - kill $! || true - return $_fail + make -f client.mk build MOZ_PGO=1 else make -f client.mk build fi + + kill $! || true } package() { cd "$srcdir/$DEBIAN_BUILD" - make -j1 -f client.mk DESTDIR="$pkgdir" install + make -f client.mk DESTDIR="$pkgdir" install install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 6862f2c0e..9e4b75e36 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,29 +1,28 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-03-26 19:17:35.000000000 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-04-03 16:10:57.681396937 -0300 -@@ -1176,12 +1176,9 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-05-16 21:59:28.314070275 -0300 +@@ -1203,12 +1200,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -// Default social providers --pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); +-pref("social.manifest.facebook", "{\"builtin\": \"true\",\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAACNNJREFUeNrtm3tw1NUVxz/399hHHkgCaCBGEFEEREVFYFQcSoOKdkZay4z+4dDpYIsjHWx1WoTMhFi1gzBSpVgVGbU4U1sHfPESKODwEEnRYDFAICEIeZIQshs2u/v73ds/drMsyW7YLEkl2Z6Z32yy+9v7u+fc7znne8+5KzgvAjDunzlv0M13PjDZ6c4cARj0WhEoaZ1tOn3yq9XLf/tNU0O1D5Ad7wq/OpxpaXOL1j5uZAwuaGlVgwNBhULRm0XXBG6HZrlNa9uRrzfM+3DlgjIgGMsA7rl/XDdHOnNf9vosTfVuvTsaQhdkZ4iykh2rHtqydvkxwI58BhjTfv7MmP55E9/1nLNdfU15ACkVvoAaMCRvRPa+re9+DgTaPjMAx+DrJv3M67Mz+6LybWLb4NfTHhxzx31DDhZvOtqGAgNwWbjGICV9XQJB0e/KobcOP1i8qTzaAEYgaDtNU/V5A9hSaUFLuQEt2gVQSgml+j4CUAIppYgK/m0GkCjZ9xGAUNAu0LUhgJRAAAIVzwBSqVRQH4hlAClRKZAFhOgEASoFECBR8QwgUyQGdJT/B8HzCEiBNKhUJzEgBYIgQsTJAkohe9oFZHgHKvQoHtZ9K3tewfiixXABLdoFeuSSEmkF+PH4QTz7+M3o+ENptzvGtS36uSwmjMpAYF10XCllHCYoe84FlLS555Zs5jx6J6ahY+iCl98pJiDNS1hwSZop+cm91zJmxEBefGsPlu1AxKC67V3gf5oGlZSMuz6Dp2fdhWnoAEwaN5T5hsYLb+4hKB1dcgelFDpB8ifk8thDt3DO5+fZxRvxBV0IjQR0EB3KfD1GhJS0GZnnYuGcKTgdF9ZWx4/No/BJjUUrdtJqm4iL+K5SCmSAiWMHMevhcQzNzaa6ron5SzfQ7HeiaSKx+au4m6HupcJKSYZdZVI4dypuV2yo3zoql0VP3cOiFV/Q4jdiGkGhQFqMGpbJL346kbE3DEYIQWNTC39Ysp4Gr4HQtZDyiRhA0NlmSHZbRM7pr1H0m6lckeHqdGXG3jCYoqfupeC17bT49fNRXIFSNrkDTGbNGM9dtw1D10M1DI/Xx3NLP6OqETRdDy1eglPT4rqA7K56gCIrXfHCvHwGZqUnBMtR113FS/N+xHPLtuJpDa1mVobg0emjmX7vqEjsUErhaw1Q8Mo6yk4F0A1HeOW7kIlFx/u7jworRabLpmhuPjmD+iG7YNDrrhnIS09P5cW/buOeO67lkftvJt3tDE06PE7Qsnh++QYOHPOim86wcVUS0+whJug0ghTMmcK1V2eH8m2UHP++nrwhAyIwjiXDcrN5vXAGhqGhFBeMYUvJ0re2sPfgGTTDGUZrEogVopMgmGQWUCgMEWTBE5MZPSLngnGqas/w9j92s31fJfmThvPM7HyMMKRj+qgmOiBHSsnr73/B5r1V6A53KD4k3bFS8dNgckFQoWPxu1kTGDc6N7JqzR4ff/+smE+2H8FSLkx3FluLawhaG3n2iXwcppGoV/Hemt18tK0c3UwLIfUS2nVafBeQJNUXkAF+/dht3H37cKSUBC2bTTv+w98++YazPg1dT0NoIUhruoMd+2sJrtjI7381rQM3iCVrN33N++tL0c30xFNdp0GQeFRYQhcRIO0gv5xxE/fdfSO2bfNVSTmrPtxLZW0A3XSh6VporaLG1XQHu0pOU/TaOhY8+QAuZ3w6vHnnQd74536EkZ50wOsSE0zcugolbWZOG8GM/LGUVdSw6sM97D/UgGa60QxXzMJDZAq6yb7SJgr//CkLn5pOmsvR4Z5dxUdZ9t6XoKfFjNyXkqZjuoBUCpGgCyhp8eDdQ5k++UaWrdrMlr2VSFxoZlpE8YtNWGgGXx9ppnDZpxTMfTCS8gAOlJ5g8ds7kCItTIi6j6FqMVxAC2sV2RB1ekmLCTcNpH+myeyFH7BxT1Voopoe4RKJXQqhmxw45mXh0o/xeH0opThcXs2iv2wmoFyhAnbC4yX+3PgISMDShrA5XHGa3d9UITRniIeTfHASmsGhEz7mL/mI2TPv4sU3t+KzHAnu7JKpCosOkcSIICAB5hZE0OiRCM0Iwb0b6LPQdI5W+Zn/yucoYYayRk+16eK1xqRMDAHtA0r3lep0lNAjO8kfpCpMqpTF4xZEUqA7rIlOCiKpgADVWXc4FQwgEfHPB5AiByTixIDUCYJx+wJoqdIcJV5VOAWygEZcF7BToT2upFDKtuz2BrAtf8v3mju972cBJX2exso6ok6N64BhOtM11xXXPBz6v6340PcuO+DZfaJkzWqgqY3L64Bqaaz0ZV45Mkc308dG2kd97FLSaq4v317gazr5HeCLRoACFTxbfeBw+oDhWYYj4/rw+30H+rb/VMPxXQsbKnbuABqJOi4vogyRiRB5/XNvvz3zytFTDEf61eF9b0dCKTS36c4afymTsgLeQ9Ly13X/aYnzE1Uy6PV7679trNy1xe+tKwPqAH/0Vla0qw65gH7AFeG/Y3Uy9P45o0bm3PTIaplM6lTK9jWf/OBUyQcrpdXaTIyfsXQb9QcLaAn7vJd2vxY5XxBpo8pwDmgFGsLKx1oeh8OVmUUSLXUlrWZPzbdLag9v+BjUqfDzepKAyDDcZbznGHG+1NmqSKHpVlfbadJqLW+o2LHobNX+PUB1WPkfnHwYyTmX6lI7Lehr3F576NM/+T3V3wH17f2w1xkg2ggXuSvga6p8p+bgmpVKWpXAmVh+2AsNEKogdYYAJa0GT03J4obyf60HTgKe6PTTqw0QOpcQ3wXs4LlDZyq2FXrrS4uBmjDxuCw3G5eIgA46yeC5ho11pWsWW35PWTibBC4Xf+9eBLRPg0q2+s5UvHG6bMNqJYPHw7nXutxZYvIIiMoCSgbrPVX/fv7syS+3AKfC5MOmF4iRpP6RjrId8O5vrNhS1NpUWQLUholUr6muXEoatP3emrWNR9e/avk9R8P+HuxNypPkrk93pGdnK0VtXemaN6UdOHo55vdE5b/0NKx+K4AxtAAAAABJRU5ErkJggg==\", \"description\":\"Keep up with friends wherever you go on the web.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com/about/messenger-for-firefox\"}"); +-pref("social.manifest.mixi", "{\"builtin\": \"true\",\"origin\":\"https://mixi.jp\",\"name\":\"mixi\",\"description\":\"好きなWebサイトを見ながらmixiのチェックもできる便利なツールです。友人がつけてくれたイイネやコメントを通知するので、見落とさずにすぐにお返事ができます。また友人が今何をしているかをいつでも確認できます。\",\"workerURL\":\"https://mixi.jp/static/public/js/sidebar/firefox/worker.js\",\"sidebarURL\":\"https://mixi.jp/firefox_sidebar.pl\",\"iconURL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozMDZFOUZCMDkyQzIxMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozMDZFOUZCMTkyQzIxMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDc1OTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDc2OTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+fT8vWQAAAkxJREFUeNpi/P//PwMlgBFdIDtST4GLg6Weg50lgJmJUQAm/vff/w8/fv7Z8O3Hn8apyy89wGpAWZJxv7AAR4GYEBeDAC87AxsrEwMjIyMDyJW/fv9j+PD5J8PLt98YXr/7nti78NwCFANq0k3ny0vyJUiL8wA1szGwszEzMDOBDGBgAPny779/DD9//WV49/EHw8NnnxkePv+c2DXv7AJmkObqNNMCZVn+CiBm0LaMZuBgZ2YQVnBg4BSQZ/j27g6DqKoHA7+kAdhFrP8/AOVZGP4xMLlqKAhMYwEZIC8rWi0vyc7AD3S2lE4Iw9/f3xg+PTvDwCflwSCuGczw4+NDsCtFVDwYvu/IZxAGhgwwLLh//JGIZKnLNHMQ4mEQ4eNhBzoZ4qNnlxYzvH94iEH82xsGQXlbhruHWhiYWbkYtH1ng13159d1Bn4eNgYFRRkHJkv7QA1eLjYGVhYmeGD+/vYaif0GEgtAV8FDHmgPSD03Nw8vExMzIwMLEDMykp4GePjF3zFpGXvc/kdiWgLFyn9G9n8aJr47GYFxzHft2IJ7P57uFGZhZiLKgD9//zGwSTg/07FN0WQCJpRPWlYJjRyipp/+EuEUUKL6xyb+E6i5A6SXEUmi/cn1HQnv7mwW/v/rAyu2MPkHtIBVUPuLskXWIU4eIW+MpAw0JAhI5Xz7+Ezh++eXYEPePjjE9+X5ST5GZo5/ohphr6Q1PdYB1VSCbMfnTGkgNgPhS4fmbXl4ddvzn98+noNagJobicjOME17gBjDVoAAAwDPu94Fx/JhBAAAAABJRU5ErkJggg==\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpENEJDNzQ3MzkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpENEJDNzQ3NDkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDcxOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDcyOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+0Zya+QAABRJJREFUeNrEV11sFFUUPjOzMzs7u92Z2W532227u6Ur7VJsS02VBqnwYAIvNYJREQnhgRcIAaNI6hPxxZ+YgJFoeDCGNBhCDNSEGB54wBpFTZtWjC3B8tNq20CX7S5s9292Zz331sXd7fYvLfYkNzNz5977nfOdc+49l8lkMrCawixl8KE3mrYIPIeNfYHn2WaWYZTc/8QWLaVfTWrpgYSW/v6zs791L1uBA683Kiaj4YhF4vdaLYJXtgiA74B9YDCwwDD/LZFO6xCLpyAS0+BhJAmhR4m7j6a1M7FE6uTn566HlqzA23tbjqiKeNyhirJdMUGJWUBgDpAFCo4MQA4+EHciA5DUdIgnUhBGJQJTMbgXjI8GQ7HDJ7r6uxelwMFdjYrNKl50OcxbXGVmUGURJBEt5tg8wPmEuCOFjESRjUAoDmP3IjB2f/rkh1/2vpU7jiucePjN5uYKh2XA55brayqtYFdNlG6OYxYNTi3DsRzLgFEwUJeRhmtsbKyze3v6xr8tqsCRPc1et8v661q3bK1yWsCKlHNLsHpORXANERkkLGLMNK9/qjT8Q9/4z3kKHNrdpLjL1Su+6pKqSocFRKMhL8CWKyReBIGjjKQzbHu9V/n6p4GJkCE7oMJpO1ZdLjaUl0o0yAi2IJWBYLZDOhmFWHgEOF4Ck+IBUfZAHL8jk0N5ICbsF/F/WotCPDQCyehk3n/iEpJFLrsoRRNlH2HXa9TEo/tavHVe9c5ajwKYao8td/p3YtsB04EhCI70gKtxD1UiKwRg5NoJ+u5q2gNmuz8PMDB8Gcavd80KzmkMzOHREAzeDtZQF7y6vfG0p8LUYMNo51j28WBL2TpsfgQ1g1LVBizHU2WIhbyo0H6p1Ad233YwlrioQvHwKO0nYyWbj45PRgOzYiKjZyDDqzMusMmGDtVqpGlWTIjVxAXE2iytdt82ygihnQixlFicHV+/7VP6VN3ts1xFXEGyQpWlDvb4gee2yBIjGgVu3iCaQIBcn06hS3Lfs+B0R0SGHo730nfBXFZ0PRJnIp9xszW1dbvNJEdZdk5wAlxoBQHJSniir8icwLwGkZ1UTwbtrMNZVSkY5s91bYHFdG16yWlpwI1NRNZZssOxLLMqR7HiqIsaVqsO0FIZSELmAWsQpNhq1CTkoLLY1oyy5d4NA/oqaKBpaSivab3I+lu2f8PwivZ/6qDjJiTan45U+1rP0ei72XthMDx83o+lVn6uFpwFhUJ2SSIx3Pdz03KhuVGsmtwbj56vrG2dOQuwktnRe6mzi0+MSCt5AhaTNFovOJ6famg/sAmxhtiZ/Zm5sH7ru5cSaf6JhgMp2XTemfA07TxFwOkxnf0pmtX9vs2dNzK8/ETigVbMuqC7W/Zds8jOT4rWhKihPxELn7517dSGZPAPy0ptUAQ8DYJes+nYDbW8/pWs9UWLUlTCio8PHvzV3zH++9kyPTZuXE5cENoZsSJR/cz+W4Xg85blOPFZfLwXvn+zOXDnqjUe/FNKRceWpAxJN15tiNS2HewRJeWdQvBFXUyIW/DxMjaikP/B3/1Sfq0HcPvHj6t4A5tHOSPImnPdrkln7WZyF+hE8IdFD6WFq1qq9VABM3kSiWq/kIKGBi9n1K3VW6dc6zoGjSb5fZx/ZcXuhnPJd1+8lKl2+xK2NS9O2T1tE4LJ+hV2n5nL6hWXybGhu8hMN9nQ/g3ixd8bVuh67s9101LkHwEGAHiA8Hoi/Qh6AAAAAElFTkSuQmCC\",\"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpENEJDNzQ2RjkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpENEJDNzQ3MDkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDZEOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDZFOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+zVczFAAACZBJREFUeNrkW3ls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\",\"author\":\"mixi\",\"homepageURL\":\"https://mixi.jp/promotion.pl?id=social_sidebar\"}"); +-pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,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\",\"icon64URL\": \"data:image/png;base64,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\"}"); +-pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, 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\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}"); - - // Comma-separated list of nsIURI::prePaths that are allowed to activate - // built-in social functionality. --pref("social.activation.whitelist", "https://www.facebook.com"); -+pref("social.activation.whitelist", ""); - pref("social.sidebar.open", true); pref("social.sidebar.unload_timeout_ms", 10000); + pref("social.toast-notifications.enabled", true); diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 18:44:27.000000000 -0500 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 -@@ -5,70 +5,41 @@ - // If a definition requires additional params, check that the final search url - // is handled correctly by the engine. +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-16 23:09:05.295723370 -0300 +@@ -3,69 +3,41 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + const SEARCH_ENGINES = { - "Google": { -+ "DuckDuckGo HTML": { ++ "DuckDuckGo": { image: "data:image/png;base64," + - "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + - "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" + @@ -86,7 +85,6 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil -#ifdef XP_MACOSX - , imageHD: "data:image/png;base64,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" -#endif -- , params: "source=hp&channel=np" + "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" + + "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" + + "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" + @@ -123,16 +121,18 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil } }; -@@ -78,7 +49,7 @@ +@@ -75,8 +47,8 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" +-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" + "http://packages.debian.org/experimental/iceweasel" - , "https://www.gnu.org/software/gnuzilla/addons.html" ++, "https://trisquel.info/browser-plain" ]; -@@ -141,10 +112,6 @@ + const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. +@@ -139,10 +111,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); logoElt.src = searchEngineInfo.image; diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 8fa6a5da1..21d56e13c 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -21,7 +21,6 @@ ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi #ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt index 32c94b018..5f8c88e9e 100644 --- a/libre/iceweasel-libre/replace-urls.txt +++ b/libre/iceweasel-libre/replace-urls.txt @@ -13,7 +13,7 @@ https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[ https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/?(\?[^"']*)? https://trisquel.info/browser-plain https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index bd8bcb148..5e17c00d0 100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -19,3 +19,19 @@ pref("dom.storage.enabled", false); // Enable gstreamer support pref("media.gstreamer.enabled", true); + +// Preferences for the Get Add-ons panel +pref ("extensions.update.notifyUser", false); +pref ("extensions.getAddons.showPane", false); +pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.maxResults", 5); +pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain"); +pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain"); +pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain"); +pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain"); +pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain"); + +// Dictionary download preference +pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain"); diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index ffd2362be..73f1135e0 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35920 pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 93958ca69..023b703b4 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mplayer-vaapi-libre pkgver=35107 pkgrel=7 pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' diff --git a/pcr/minaton-lv2/PKGBUILD b/pcr/minaton-lv2/PKGBUILD new file mode 100644 index 000000000..797a74653 --- /dev/null +++ b/pcr/minaton-lv2/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +pkgname=minaton-lv2 +pkgver=0.0.3 +pkgrel=1 +pkgdesc="A music software synthesizer project, LV2 instrument." +arch=('i686') +url="http://sourceforge.net/p/minaton/home/Home/" +license=('GPL') +groups=('lv2-plugins') +depends=('lv2' 'jack' 'gtkmm') +makedepends=('lv2-c++-tools') +provides=('lv2-minaton') +conflicts=('lv2-minaton') +source=("http://downloads.sourceforge.net/project/minaton/$pkgname-v.$pkgver.tar.gz") +md5sums=('b5190a6c6942c1a1fe6b929963ad1f86') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + + # set bundle_path + sed -i "s|\(string bundle_path\);|\1 = \"/usr/lib/lv2/minaton.lv2/\";|" *.{hpp,h,cpp} + + make +} + +package() { + cd "$srcdir/$pkgname-v$pkgver" + make INSTALL_DIR="$pkgdir/usr/lib/lv2" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/petri-foo/PKGBUILD b/pcr/petri-foo/PKGBUILD new file mode 100644 index 000000000..72ca1e45a --- /dev/null +++ b/pcr/petri-foo/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/petri-foo/ +pkgname=petri-foo +pkgver=0.1.87 +pkgrel=1 +pkgdesc="A fork of specimen, a MIDI controllable audio sampler, for JACK." +arch=('i686') +url="http://petri-foo.sourceforge.net/" +license=('GPL2') +depends=('jack' 'libgnomecanvas') +makedepends=('cmake') +optdepends=('liblo: Non Session Manager support') +install='petri-foo.install' +source=(http://sourceforge.net/projects/${pkgname}/files/Source/${pkgname}-${pkgver}.tar.bz2 + petri-foo-0.1.87_fix_recent_file_not_exist.patch) +md5sums=('40f8a224368187672f9f306f8a4fa8c5' + '964db40cc53d77d42f6593f2201b9c40') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../petri-foo-0.1.87_fix_recent_file_not_exist.patch + cmake -DCMAKE_INSTALL_PREFIX=/usr -DUpdateMime:BOOL=OFF . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch new file mode 100644 index 000000000..3e88487b0 --- /dev/null +++ b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch @@ -0,0 +1,24 @@ +diff -Naur a/gui/bank-ops.c b/gui/bank-ops.c +--- a/gui/bank-ops.c 2012-08-06 05:33:34.000000000 +0200 ++++ b/gui/bank-ops.c 2012-08-07 17:57:28.580145691 +0200 +@@ -393,6 +393,8 @@ + g_signal_connect_swapped(G_OBJECT(msg), "response", + G_CALLBACK(gtk_widget_destroy), msg); + gtk_widget_show (msg); ++ ++ gtk_recent_manager_remove_item(recent_manager, filename, NULL); + } + else + { +diff -Naur a/libpetrifui/dish_file.c b/libpetrifui/dish_file.c +--- a/libpetrifui/dish_file.c 2012-08-06 05:33:34.000000000 +0200 ++++ b/libpetrifui/dish_file.c 2012-08-07 17:56:09.063909801 +0200 +@@ -1440,7 +1440,7 @@ + + if (stat(path, &st) != 0) + { +- msg_log(MSG_ERROR, "file '%s' does not exist\n"); ++ msg_log(MSG_ERROR, "file '%s' does not exist\n", path); + return -1; + } + diff --git a/pcr/petri-foo/petri-foo.install b/pcr/petri-foo/petri-foo.install new file mode 100644 index 000000000..5dd24bbe5 --- /dev/null +++ b/pcr/petri-foo/petri-foo.install @@ -0,0 +1,19 @@ +updatedesktopdtb() { + [ -x /usr/bin/update-desktop-database ] \ + && update-desktop-database -q + [ -x /usr/bin/update-mime-database ] \ + && update-mime-database usr/share/mime > /dev/null 2>&1 +} + +post_install() { + updatedesktopdtb +} + +post_upgrade() { + updatedesktopdtb +} + +post_remove() { + updatedesktopdtb +} + |