From a8a0c9d4965d7b004de5659cb9dcbadd8d8d714d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 12 Jun 2012 14:09:59 -0300 Subject: linux-libre-3.4.2-2: fix potential nfs4 issue and updating version for mips64el --- libre/linux-libre/3.4.2-rpc_pipefs.patch | 34 ++++++++++++++++++++++++++++++++ libre/linux-libre/PKGBUILD | 13 +++++++++--- libre/linux-libre/linux-libre.install | 2 +- 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 libre/linux-libre/3.4.2-rpc_pipefs.patch (limited to 'libre') diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch new file mode 100644 index 000000000..5c3245669 --- /dev/null +++ b/libre/linux-libre/3.4.2-rpc_pipefs.patch @@ -0,0 +1,34 @@ +diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c +index 0404047..21fde99 100644 +--- a/net/sunrpc/rpc_pipe.c ++++ b/net/sunrpc/rpc_pipe.c +@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head, + msg->errno = err; + destroy_msg(msg); + } while (!list_empty(head)); +- wake_up(waitq); ++ ++ if (waitq) ++ wake_up(waitq); + } + + static void +@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work) + } + dentry = dget(pipe->dentry); + spin_unlock(&pipe->lock); +- if (dentry) { +- rpc_purge_list(&RPC_I(dentry->d_inode)->waitq, +- &free_list, destroy_msg, -ETIMEDOUT); +- dput(dentry); +- } ++ rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL, ++ &free_list, destroy_msg, -ETIMEDOUT); ++ dput(dentry); + } + + ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg, +-- +1.7.7.6 + + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 4f10a211a..78f03392c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,8 +14,8 @@ _kernelname=-LIBRE _basekernel=3.4 _sublevel=2 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver -pkgrel=1 +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,6 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' + '3.4.2-rpc_pipefs.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' 'ea827952923c8a926c0831ad3f124190' @@ -43,7 +44,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - 'f70a4bf0ee00d8be680cfbd65459836d') + '18b3877f9014c8cdd5eb8f6a9e8a3a3a' + '972b3b460764780ee48f031a043a9c09') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -60,6 +62,11 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # fix nfs4 regression + patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch" + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 584f0f645..985ebf0c7 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.2-1-LIBRE +KERNEL_VERSION=3.4.2-2-LIBRE post_install () { # updating module dependencies -- cgit v1.2.3-2-g168b From 265dda80d0d6cc59f5953ed104abbd075456d841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 12 Jun 2012 14:24:58 -0300 Subject: linux-libre-3.4.2-2: fixing md5sums --- libre/linux-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 78f03392c..7ff0def9e 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -44,7 +44,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '18b3877f9014c8cdd5eb8f6a9e8a3a3a' + '0851216ee7ac3aad76438bb937314fd1' '972b3b460764780ee48f031a043a9c09') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. -- cgit v1.2.3-2-g168b From aa3bf38902a10744b2cad6dca926095bce6a6799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 12 Jun 2012 17:45:53 -0300 Subject: linux-libre-3.4.2-2: fixing linux-libre.install --- libre/linux-libre/linux-libre.install | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libre') diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 985ebf0c7..d71020483 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -8,6 +8,8 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} @@ -51,6 +53,8 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} } -- cgit v1.2.3-2-g168b From 9ac40614dd4a52b0af5c1c521fe644ccb2d32c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 12 Jun 2012 17:48:32 -0300 Subject: linux-libre-3.4.2-2: fixing linux-libre.install --- libre/linux-libre/linux-libre.install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index d71020483..2f2944e2b 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -10,8 +10,8 @@ post_install () { depmod ${KERNEL_VERSION} if command -v mkinitcpio 2>&1 > /dev/null; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then @@ -55,8 +55,8 @@ post_upgrade() { depmod ${KERNEL_VERSION} if command -v mkinitcpio 2>&1 > /dev/null; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { -- cgit v1.2.3-2-g168b From 2890c32a0f80a55893fb3b182db6c58ea8215a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 12 Jun 2012 18:21:06 -0300 Subject: linux-libre-3.0.34-1: updating version and fixing linux-libre.install for mips64el --- libre/linux-libre-lts/PKGBUILD | 4 ++-- libre/linux-libre-lts/linux-libre-lts.install | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index ac7ab36e8..f8c0edc6a 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -11,7 +11,7 @@ _kernelname=-LIBRE-LTS _basekernel=3.0 _sublevel=34 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.32 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.34 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '9c4fed22ad8ea99a54d20c22a63ad3d7') + '1a107ca509aec77af60fe8e9612c9fae') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 55ed9e496..ba3511bcf 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -8,8 +8,10 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then @@ -51,8 +53,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { -- cgit v1.2.3-2-g168b From 4a9007ba3b311b4260392b9a3b6ba8f7ae99cf87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 00:43:53 -0300 Subject: clementine-libre-1.0.1-4: updating release, dropping -DENABLE_REMOTE=ON and adding gvfs dependency --- libre/clementine-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index defa4ae57..466810d2b 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -8,14 +8,14 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.0.1 -pkgrel=3.1 +pkgrel=4 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl') + 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') makedepends=('cmake' 'boost') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' @@ -52,7 +52,7 @@ build() { # Remove nonfree spotifyblob folder rm -Rf "./spotifyblob" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make } -- cgit v1.2.3-2-g168b From a67fa7fcea87eef9d885b3af3344e4f0d39ddcba Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 14 Jun 2012 15:33:12 -0400 Subject: libre/mozilla-searchplugins: remove DDG SSL (non-free js) and add Seeks --- libre/mozilla-searchplugins/PKGBUILD | 6 +++--- libre/mozilla-searchplugins/duck-duck-go-ssl.xml | 8 -------- libre/mozilla-searchplugins/seeks-search.xml | 8 ++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 libre/mozilla-searchplugins/duck-duck-go-ssl.xml create mode 100644 libre/mozilla-searchplugins/seeks-search.xml (limited to 'libre') diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index c86c9514a..f30d4f04a 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -8,7 +8,7 @@ # Contributor: Muhammad 'MJ' Jassim pkgname=mozilla-searchplugins -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') @@ -16,11 +16,11 @@ license=('MPL' 'GPL' 'LGPL') url="https://parabolagnulinux.org/" source=( duck-duck-go-lite.xml - duck-duck-go-ssl.xml internet-archive.xml jamendo-en.xml logless-search.xml scroogle-ssl-english.xml + seeks-search.xml wikipedia.xml yacy.xml ) @@ -31,10 +31,10 @@ package() { } md5sums=('e1bda0854de7d764f7401c81bb82b5ef' - 'c5f00b6b24222aacd5a749d1f59c4d24' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' 'cf97082e77e3ef5f1bd74b1db9329965' + '86ccb1d02683e69e6bc0543cb77a06bc' 'c35f4971feff8387e0570d7a165eb6fa' '24528ca3f7f1e1a0ba735231aa3ac1de') diff --git a/libre/mozilla-searchplugins/duck-duck-go-ssl.xml b/libre/mozilla-searchplugins/duck-duck-go-ssl.xml deleted file mode 100644 index 4fb1391ab..000000000 --- a/libre/mozilla-searchplugins/duck-duck-go-ssl.xml +++ /dev/null @@ -1,8 +0,0 @@ - -Duck Duck Go (SSL) -Search Duck Duck Go (SSL) -UTF-8 -data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== - - - \ No newline at end of file diff --git a/libre/mozilla-searchplugins/seeks-search.xml b/libre/mozilla-searchplugins/seeks-search.xml new file mode 100644 index 000000000..5025f5a06 --- /dev/null +++ b/libre/mozilla-searchplugins/seeks-search.xml @@ -0,0 +1,8 @@ + +Seeks Search +Real-time p2p pattern matching network for social websearch. +UTF-8 +data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAwwAAAMMBnc7+MwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJCSURBVDiNpZJLSFRxGMV/f2fGGWcc8zI6U5qSmmVPyIW0kURoES1CMgODwgh72yZoU1EQRItMooLQLAiLBAsiaVGRBKFID0oqMpqy0UIdnWke1zuPe/8tNHtAwdTZfHyc75zDB0dUtiiXgAZAkBokcFlUtigyReEvSPsf8T8ZSAkYP3bz3w6TGiQ00OMgDTCM6QmQZgKr4zcDaUA8CnEN9NhM2h9g6KDrPxloIYiFp1NSgdnQIToBpTkrqaneQp5SyIexd1x/3MrngA+AEs9ialdvo8BVxJDfS2dvO0Pj76cdyg8r8lBHo0zqCflVDci+wR6pxqIyooXl1nPr5P72ehlLaDKkBmXvYI+MaGGpxafkrtZaWX5UkaLqRLG8c/AFL4eesLutDt1IkpFu51rTPWyWDBw2J97Rt+y4WENST2C12Liyp5u52fmsb16BeWneKhzWTFzOXNp23pr9zWJKZ75rAQBz7AqtjTdnOXu6gxynm1LPcsxqTKWr7yoIgfjeZgE2SwZqLIoQgshUmOHJTzOUYCTgY8D3jGQiifmptw+HSaGitJK2B2eYCI8zTyngZP0Fnnv7sVszmYqrNN8+xkR4nHxXIdurD/BwoJs3wwOYpQ6ByCQl7jKObDxNSA3icrpRY1HO3z1FliObhqp9HK87iz88hiszF7PJgj/kx9BBLGlSpJGEIs9C1ixbS5FnEaPBEbp6OxgNfgGgMLeYDRWbyclyMzjyikev7+Pzf8RkAVG2V+mUkk2p1QeQINK48Q3fpPIi5xKaPwAAAABJRU5ErkJggg== + + + \ No newline at end of file -- cgit v1.2.3-2-g168b From e54fcc1e21168b8bdb7e74f803b350222d82d0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 22:04:16 -0300 Subject: xscreensaver-libre= new package --- libre/xscreensaver-libre/LICENSE | 9 ++ libre/xscreensaver-libre/PKGBUILD | 47 ++++++++++ libre/xscreensaver-libre/add-electricsheep.diff | 12 +++ libre/xscreensaver-libre/libre.patch | 112 ++++++++++++++++++++++++ libre/xscreensaver-libre/xscreensaver.pam | 1 + 5 files changed, 181 insertions(+) create mode 100644 libre/xscreensaver-libre/LICENSE create mode 100644 libre/xscreensaver-libre/PKGBUILD create mode 100644 libre/xscreensaver-libre/add-electricsheep.diff create mode 100644 libre/xscreensaver-libre/libre.patch create mode 100644 libre/xscreensaver-libre/xscreensaver.pam (limited to 'libre') diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver-libre/LICENSE new file mode 100644 index 000000000..4f587b5a3 --- /dev/null +++ b/libre/xscreensaver-libre/LICENSE @@ -0,0 +1,9 @@ +/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. No representations are made about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + */ diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD new file mode 100644 index 000000000..0d5bc34ff --- /dev/null +++ b/libre/xscreensaver-libre/PKGBUILD @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Eric Bélanger +# Maintainer (Parabola): André Silva + +_pkgname=xcreensaver +pkgname=xscreensaver-libre +pkgver=5.15 +pkgrel=3 +pkgdesc="Screen saver and locker for the X Window System" +arch=('i686' 'x86_64') +url="http://www.jwz.org/xscreensaver/" +license=('BSD') +depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ + 'perl-libwww' 'perl-http-message') +makedepends=('bc' 'libxpm' 'gdm') +optdepends=('gdm: for login manager support') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") +backup=('etc/pam.d/xscreensaver') +source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ + add-electricsheep.diff xscreensaver.pam LICENSE libre.patch) +sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' + '677496218b81a42d90bee400026e94dd87fb8ffb' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + '4209ea586b204fd1d81c382a0522c654f9fd9134' + '327b839eb5d069827c1f25ef19fc8d4e83de7ab2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/add-electricsheep.diff" + patch -p0 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that not have source code supplied + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ + --with-pam --with-login-manager --with-gtk --with-gl \ + --without-gle --with-pixbuf --with-jpeg + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install_prefix="${pkgdir}" install + install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" + chmod 755 "${pkgdir}/usr/bin/xscreensaver" + echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" +} diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff new file mode 100644 index 000000000..18b4dea97 --- /dev/null +++ b/libre/xscreensaver-libre/add-electricsheep.diff @@ -0,0 +1,12 @@ +--- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400 ++++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400 +@@ -347,7 +347,8 @@ + @GL_KLUDGE@ GL: rubikblocks -root \n\ + @GL_KLUDGE@ GL: companioncube -root \n\ + @GL_KLUDGE@ GL: hilbert -root \n\ +-@GL_KLUDGE@ GL: tronbit -root \n ++@GL_KLUDGE@ GL: tronbit -root \n\ ++ electricsheep --root 1 \n + + + diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch new file mode 100644 index 000000000..569f8435c --- /dev/null +++ b/libre/xscreensaver-libre/libre.patch @@ -0,0 +1,112 @@ +diff -Naur xscreensaver-5.15/hacks/images/m6502/dmsc.asm /dev/null +--- xscreensaver-5.15/hacks/images/m6502/dmsc.asm 2008-03-02 03:34:37.000000000 -0200 ++++ /dev/null 2012-06-14 14:00:43.782877377 -0300 +@@ -1,108 +0,0 @@ +-; By DMSC - daniel.serpell@gmail.com +-; +-; This demo was programmed in ACME: +-; http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/ +-; +-; If you want the source code, send me an email :-) +-; +- +- dcb 76, 94, 11,133, 32,162, 8,160, 8,145, 16,136,208,251,165, 16 +- dcb 24,105, 32,133, 16,165, 17,105, 0,133, 17,165, 32,202,208,231 +- dcb 96,230, 48,165, 48, 41, 63,133, 48,170,189,106, 6,170,189, 8 +- dcb 3,105, 1, 41, 3,157, 8, 3,138, 73,231,170,189, 0, 2,105 +- dcb 1, 41, 3,157, 0, 2,165, 48, 73, 63,170,189,106, 6, 73,224 +- dcb 170,189, 8, 2,105, 1, 41, 3,157, 8, 2,138, 73,231,170,189 +- dcb 0, 3,105, 1, 41, 3,157, 0, 3, 96,224,192,160,128, 96,225 +- dcb 64,193,161,226,129, 32,194, 97,162,227,195,130,228, 65,163,196 +- dcb 98,229,131,164,197,230,231,132,165,198, 99, 66, 33, 0,199,166 +- dcb 133,100,167, 67,134,101,135, 34, 68,102,103, 69, 35, 70, 71, 36 +- dcb 1, 37, 38, 39, 2, 3, 4, 5, 6, 7,166, 48,189,198, 6,170 +- dcb 254, 24, 3, 73, 7,170,254, 16, 3, 73,231,170,254, 24, 2, 73 +- dcb 7,170,254, 16, 2, 96, 0, 32, 1, 33, 64, 2, 65, 34, 96, 66 +- dcb 3, 97, 35, 98, 67,128, 4,129, 36, 99,130, 68,160, 5,161,131 +- dcb 100, 37,162, 69,132,192,163,101, 6,193, 38,194, 70,164,133,195 +- dcb 102,224, 7,225, 39,165,226,196,134, 71,227,103,197,166,228,135 +- dcb 198,229,167,230,199,231,166, 49,189, 21, 7,170,189, 0,160,157 +- dcb 0, 5,230, 49, 96,195,227,194,162,228, 97,226,128,129,130,225 +- dcb 64,161,163,224, 96,160,193,196, 32, 98,192, 65, 0,131,229,164 +- dcb 33, 99,197, 66,132, 1,230, 34,165, 67,100,198, 2, 3, 68, 6 +- dcb 35,133,166, 5,101, 4,199, 7, 36,231, 69,134,167, 37, 38,102 +- dcb 135, 70,232, 71, 39,103,136,200,168, 8, 11, 10,169,233,104, 9 +- dcb 12,137,201, 13, 40, 44, 72, 43,170, 42, 45, 41,105, 73,202, 14 +- dcb 138,234, 74, 75,106,203, 76,171, 46, 77,235,107,139, 15,108,172 +- dcb 174,140,173,141,142,204,109,206,207,205, 78,175, 47,236,239,143 +- dcb 237,238,110,240,241,111,208, 16, 79,176,209,242, 48,144,243, 80 +- dcb 177,244,112,210, 17, 49,178,179, 52, 53,147, 18, 81,211,145, 19 +- dcb 146, 51, 85,180, 20, 54,113,148, 22, 50, 84,212, 21, 55,115,245 +- dcb 83,114,116, 23, 82, 86, 88, 89, 87,118,117,119,149,213, 56, 57 +- dcb 181,214, 90,121,122,150,151,182,183,215,246, 58,120,247, 24,153 +- dcb 184,152,216, 25, 26, 59, 91,248,123,185, 27, 60,217,154, 28, 92 +- dcb 249, 29,155,186, 61,218, 93,124,250,187, 30,251, 62,156, 94,125 +- dcb 219,188, 31,252,254,220,253, 63,126,255,157,221, 95,159,191,222 +- dcb 127,189,223,158,190,165, 66, 41,224,208, 72,165, 66, 24,105, 1 +- dcb 41, 31,133, 66,165, 67,240, 7,198, 67,169, 0, 76, 97, 8,198 +- dcb 69,240,247, 16, 37,166, 64,230, 64,189,177, 9, 16, 15, 41,127 +- dcb 133, 67, 73,127,208,228,169, 1,133, 70, 76, 42, 8,170,189,117 +- dcb 8,133, 69,234,234,189,181, 8,133, 65,166, 65,230, 65,189,245 +- dcb 8,133, 68,165, 66, 24,105,224,133, 66,166, 66,169, 1,102, 68 +- dcb 42,157, 0,160, 96, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2 +- dcb 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 1, 5, 3, 3, 3, 3 +- dcb 3, 2, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 4, 3, 3, 4 +- dcb 4, 1, 3, 4, 3, 5, 5, 5, 4, 5, 4, 4, 3, 4, 4, 7 +- dcb 4, 4, 4, 2, 1, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30 +- dcb 32, 35, 35, 38, 40, 43, 46, 49, 50, 52, 4, 55, 55, 60, 63, 65 +- dcb 68, 71, 73, 75, 78, 78, 33, 83, 86, 89, 94, 98,102,106,109,112 +- dcb 116, 94,120,123,127,130,134,139,144,148,153,157,161,164,167,171 +- dcb 178,171,182,186, 5, 56, 68, 56, 36,124, 4, 76, 84, 36, 68, 84 +- dcb 40, 24, 40,124,100, 84, 88, 56, 84, 72, 76, 80, 96, 40, 84, 40 +- dcb 36, 84, 56, 44, 28,124, 36, 24, 24, 36,124, 24, 52, 16, 60, 80 +- dcb 24, 37, 30,124, 32, 28,188, 1,190,124, 24, 36, 60, 32, 28, 32 +- dcb 28, 24, 36, 24, 63, 36, 24, 36, 63, 60, 16, 32, 52, 44,120, 36 +- dcb 56, 4, 60, 56, 4, 56, 4, 56, 57, 6, 56, 44, 52, 36, 12, 48 +- dcb 208, 48, 12,252,164,164, 88,120,132,132, 72,252,132,132,120,252 +- dcb 164,132,252,160,128,120,132,164, 56,252, 32, 32,252, 8, 4,248 +- dcb 252, 48, 80,140,252, 4, 4,252, 64, 60, 64,252, 64, 48, 8,252 +- dcb 120,132,132,132,120,252,144,144, 96,120,132,134,133,120,252,144 +- dcb 144,108, 68,164,164,152,128,252,128,248, 4, 4,248, 4, 8,240 +- dcb 224, 28, 16,224, 28, 16,224,204, 48, 48,204,140,148,164,196, 0 +- dcb 0,133, 41, 10, 28, 29, 63, 63, 63,136, 15, 10, 28, 29, 14, 27 +- dcb 63, 63, 63,132, 55, 17, 18, 28, 62, 18, 28, 62, 10,136, 27, 14 +- dcb 10, 21, 21, 34,143, 15, 10, 28, 29,142, 39, 40, 48, 50,149,145 +- dcb 10, 23, 13, 62, 23, 24, 32,136, 28, 24, 22, 14,136, 11, 14, 10 +- dcb 30, 29, 18, 15, 30, 21,128, 14, 15, 15, 14, 12, 29, 28, 63, 63 +- dcb 63,144,159,255, 55, 17, 18, 28, 62, 18, 28, 62, 10, 21, 21,129 +- dcb 15, 24, 27, 62, 23, 24, 32,136, 11, 34, 14, 63, 63, 63,141, 63 +- dcb 63, 63, 11, 34, 14,150,159,143, 11, 34, 62, 39, 48, 54, 38, 2 +- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 +- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 +- dcb 0, 0, 7, 63, 5, 63, 2, 9,143,159,255,169, 0,133, 42,169 +- dcb 1,133, 44,133, 45,169, 0,133, 32,169,160,133, 33,165, 42,133 +- dcb 43,162, 15,160, 15,145, 32, 24,101, 44,230, 44,136, 16,246,165 +- dcb 32, 24,105, 32,133, 32,165, 33,105, 0,133, 33,169, 1,133, 44 +- dcb 165, 43, 24,101, 45,133, 43,230, 45,202, 16,215,169, 0,133, 32 +- dcb 169,160,133, 33,169,224,133, 34,169, 3,133, 35,169, 0,133, 36 +- dcb 169, 4,133, 37,169,240,133, 38,169, 3,133, 39,169, 16,133, 40 +- dcb 169, 4,133, 41,169, 15,133, 46,160, 15,177, 32, 74, 74, 74, 74 +- dcb 170,189, 62, 11,209, 34,240, 18,145, 34,145, 36,170,152, 73, 15 +- dcb 168,138,145, 38,145, 40,152, 73, 15,168,136, 16,221,165, 32, 24 +- dcb 105, 32,133, 32,165, 33,105, 0,133, 33,165, 34, 24,105,224,133 +- dcb 34,165, 35,105,255,133, 35,165, 36, 24,105, 32,133, 36,165, 37 +- dcb 105, 0,133, 37,165, 38, 24,105,224,133, 38,165, 39,105,255,133 +- dcb 39,165, 40, 24,105, 32,133, 40,165, 41,105, 0,133, 41,198, 46 +- dcb 16,150,230, 42,165, 42, 41, 63,240, 3, 76, 95, 10, 96, 0, 11 +- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11, 0, 11 +- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11,169, 1 +- dcb 162,255,134, 16,162, 1,134, 17, 32, 3, 6,169, 2,162, 7,134 +- dcb 16,162, 2,134, 17, 32, 3, 6,169, 3,162, 7,134, 16,162, 3 +- dcb 134, 17, 32, 3, 6,169, 31,133, 66,169, 0,133, 70,133, 67,133 +- dcb 64,169, 1,141,109, 8,169, 0,141,114, 8,169,160,141,115, 8 +- dcb 169, 63,133, 48,169,128,133, 49,169, 3,141,109, 8,169, 0,170 +- dcb 157, 0,160,232,208,250, 32, 33, 6, 32,170, 6, 32, 6, 7, 32 +- dcb 21, 8,165, 66, 73, 31,208, 13,173,109, 8, 24,105, 2, 41, 3 +- dcb 105, 3,141,109, 8,165, 49,208,221,173, 17, 7, 73, 1,141, 17 +- dcb 7,165, 70,240,209, 32, 29, 12, 32, 91, 10,169, 31,133, 66,169 +- dcb 0,133, 70,133, 67,141,109, 8,169, 0,141,114, 8,169, 3,141 +- dcb 115, 8, 32, 29, 12, 32, 21, 8,165, 66, 73, 31,208,247,173,115 +- dcb 8, 73, 7,141,115, 8,165, 70,240,235, 76, 94, 11,169, 0,170 +- dcb 157, 0, 2,157, 0, 3,157, 0, 4,157, 0, 5,232,208,241, 96 +- diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/libre/xscreensaver-libre/xscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so -- cgit v1.2.3-2-g168b From d90412daad12d8c9b3d0f253e613da0f2e21a39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 22:28:06 -0300 Subject: xscreensaver-libre= fixing issues --- libre/xscreensaver-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 0d5bc34ff..f42a24fc4 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=xcreensaver pkgname=xscreensaver-libre pkgver=5.15 pkgrel=3 -pkgdesc="Screen saver and locker for the X Window System" +pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)" arch=('i686' 'x86_64') url="http://www.jwz.org/xscreensaver/" license=('BSD') @@ -18,7 +18,7 @@ replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') -source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ +source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ add-electricsheep.diff xscreensaver.pam LICENSE libre.patch) sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' '677496218b81a42d90bee400026e94dd87fb8ffb' @@ -27,7 +27,7 @@ sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' '327b839eb5d069827c1f25ef19fc8d4e83de7ab2') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" patch -p0 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that not have source code supplied ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -38,9 +38,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" make install_prefix="${pkgdir}" install - install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" chmod 755 "${pkgdir}/usr/bin/xscreensaver" echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" -- cgit v1.2.3-2-g168b From 033d60fb60f2f120c8a72d39cf8bf6f8ca275faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 22:32:11 -0300 Subject: xscreensaver-libre= fixing issues --- libre/xscreensaver-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index f42a24fc4..c7d1dce8e 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Eric Bélanger # Maintainer (Parabola): André Silva -_pkgname=xcreensaver +_pkgname=xscreensaver pkgname=xscreensaver-libre pkgver=5.15 pkgrel=3 -- cgit v1.2.3-2-g168b From e6a0f55239a403ae3571cec7325862b4828aeea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 22:34:27 -0300 Subject: xscreensaver-libre= adding mips64el on PKGBUILD --- libre/xscreensaver-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index c7d1dce8e..30b5b7dae 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -7,7 +7,7 @@ pkgname=xscreensaver-libre pkgver=5.15 pkgrel=3 pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ -- cgit v1.2.3-2-g168b From e6e68a23d312d3bb88fb5b286165d10eb65640ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 22:49:14 -0300 Subject: xscreensaver-libre: fixing issues --- libre/xscreensaver-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 30b5b7dae..ac2f4a9d8 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -29,7 +29,7 @@ sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -p0 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that not have source code supplied + patch -Np1 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that not have source code supplied ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ -- cgit v1.2.3-2-g168b From e95f2e41256637a920ba7c7dd77e5a572f465e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 23:24:58 -0300 Subject: xscreensaver-libre: fixing some parts on PKGBUILD --- libre/xscreensaver-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index ac2f4a9d8..43b189822 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -29,7 +29,7 @@ sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -Np1 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that not have source code supplied + patch -Np1 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that doesn't has source code supplied ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ -- cgit v1.2.3-2-g168b From 7fe4e57e15ef104299295da30cb624cfad71c0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 14 Jun 2012 23:26:30 -0300 Subject: xscreensaver-libre: fixing some parts on PKGBUILD --- libre/xscreensaver-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 43b189822..2404ba154 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -29,7 +29,7 @@ sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -Np1 -i "${srcdir}/libre.patch" # deleting non-free dmsc.asm file due that doesn't has source code supplied + patch -Np1 -i "${srcdir}/libre.patch" # deleting dmsc.asm file due that doesn't has source code supplied ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ -- cgit v1.2.3-2-g168b From e43be836b9f3109796bfeaa15b5466fef11c86b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 00:52:53 -0300 Subject: iceweasel-13.0.1-3: replace Duckduckgo SSL to Duckduckgo Lite as default search engine --- libre/iceweasel-libre/PKGBUILD | 7 +- libre/iceweasel-libre/libre.patch | 220 ++++++++++++++++++++++++++++++++------ 2 files changed, 188 insertions(+), 39 deletions(-) (limited to 'libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 28b96bcdd..4ab7ce7c3 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -21,7 +21,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -49,7 +49,6 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" xulrunner-copy-stub.patch libre.patch iceweasel-install-dir.patch - region.properties vendor.js Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('e440446bb92dc1c0311346c68024590b' @@ -58,9 +57,8 @@ md5sums=('e440446bb92dc1c0311346c68024590b' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'bd7d322d89001e39b1f11972507063c7' + 'fbd941d42c5f7a8601ebd4bedd2c56de' 'e529742c0a425648087bc3ce537fe4c5' - 'f1c76e7e244257856a386ca2de69bdf0' '0d053487907de4376d67d8f499c5502b' '41ce105f0c1877fe22e0c0ec45e09565') @@ -111,7 +109,6 @@ if [ $NOEXTRACT -eq 0 ]; then fi cd "$srcdir/mozilla-build" - cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 88a06741e..48348c4ef 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -64,28 +64,58 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow // by default we show an infobar message when pages require plugins the user has not installed, or are outdated pref("plugins.hide_infobar_for_missing_plugin", false); diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-05 20:07:51.593611484 -0300 -@@ -1,8 +1,8 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-13 17:38:58.964852582 -0300 +@@ -1,45 +1,12 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=DuckDuckGo - browser.search.order.2=Yahoo - browser.search.order.3=Bing +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Google +-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s +-browser.contentHandlers.types.1.title=My Yahoo! +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s ++browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.2=Seeks -@@ -17,7 +17,7 @@ + # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms} - - # increment this number when anything gets changed in the list below. This will - # cause Firefox to re-read these prefs and inject any new handlers into the +- +-# increment this number when anything gets changed in the list below. This will +-# cause Firefox to re-read these prefs and inject any new handlers into the +-# profile database. Note that "new" is defined as "has a different URL"; this +-# means that it's not possible to update the name of existing handler, so +-# don't make any spelling errors here. +-gecko.handlerService.defaultHandlersVersion=3 +- +-# The default set of protocol handlers for webcal: +-gecko.handlerService.schemes.webcal.0.name=30 Boxes +-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +- +-# The default set of protocol handlers for mailto: +-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.1.name=Gmail +-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +- +-# The default set of protocol handlers for irc: +-gecko.handlerService.schemes.irc.0.name=Mibbit +-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +- +-# The default set of protocol handlers for ircs: +-gecko.handlerService.schemes.ircs.0.name=Mibbit +-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s ++browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html --- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300 +++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300 @@ -94,7 +124,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b

<a> anchor
- <a> a + href -+ <a> a + href ++ <a> a + href

<abbr> abbr - extended text when mouseover.
@@ -106,7 +136,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul - -+ ++

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ @@ -217,7 +263,8 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in -
@getting_started@ +
Parabola GNU/Linux-libre

-

@firefox_heading@

+-

@firefox_heading@

++

Free Software Fundation

-

@firefox_help@ -
@firefox_customize@ @@ -230,8 +277,113 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in

diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-10 03:18:01.897259931 -0300 -@@ -143,7 +143,7 @@ ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300 +@@ -38,104 +38,6 @@ + * + * ***** END LICENSE BLOCK ***** */ + +-// If a definition requires additional params, check that the final search url +-// is handled correctly by the engine. +-const SEARCH_ENGINES = { +- "Google": { +- image: "data:image/png;base64," + +- "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" +- , params: "source=hp&channel=np" +- } +- +-, "Яндекс": +- { +- image: "data:image/png;base64," + +- "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" +- } +-}; +- + // The process of adding a new default snippet involves: + // * add a new entity to aboutHome.dtd + // * add a for it in aboutHome.xhtml +@@ -143,7 +45,7 @@ // The 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" -- cgit v1.2.3-2-g168b From eb3f948850a366a671ef129e3127fcc0d3beff1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 01:08:40 -0300 Subject: iceweasel-libre-13.0.1-1: fixing some things on libre.patch --- libre/iceweasel-libre/PKGBUILD | 2 +- libre/iceweasel-libre/libre.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 4ab7ce7c3..8fa19f7b8 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -57,7 +57,7 @@ md5sums=('e440446bb92dc1c0311346c68024590b' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'fbd941d42c5f7a8601ebd4bedd2c56de' + '7d4878a28d82a36235ff92f64889d552' 'e529742c0a425648087bc3ce537fe4c5' '0d053487907de4376d67d8f499c5502b' '41ce105f0c1877fe22e0c0ec45e09565') diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 48348c4ef..0b0711389 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -83,7 +83,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +browser.search.order.1=Duck Duck Go (Lite) -+browser.search.order.2=Seeks ++browser.search.order.2=Seeks Search # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site @@ -188,7 +188,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew @@ -1,32 +1,8 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google @@ -199,7 +199,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.1.title=Google -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s -+browser.search.order.1=DuckDuckGo ++browser.search.order.1=Duck Duck Go (Lite) # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -- cgit v1.2.3-2-g168b From 5c0514d48eb615b76af36bd18abaaca850031c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 01:47:44 -0300 Subject: iceweasel-libre-13.0.1-1: fixing parts on libre.patch --- libre/iceweasel-libre/PKGBUILD | 2 +- libre/iceweasel-libre/libre.patch | 109 +++++++++++++++++++++----------------- 2 files changed, 60 insertions(+), 51 deletions(-) (limited to 'libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8fa19f7b8..5936421ea 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -57,7 +57,7 @@ md5sums=('e440446bb92dc1c0311346c68024590b' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '7d4878a28d82a36235ff92f64889d552' + 'bbd1c6862a546177850ffcf967dfbaf1' 'e529742c0a425648087bc3ce537fe4c5' '0d053487907de4376d67d8f499c5502b' '41ce105f0c1877fe22e0c0ec45e09565') diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 0b0711389..992a67feb 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -65,8 +65,8 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow pref("plugins.hide_infobar_for_missing_plugin", false); diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties --- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-13 17:38:58.964852582 -0300 -@@ -1,45 +1,12 @@ ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 01:35:29.658859067 -0300 +@@ -1,23 +1,23 @@ # Default search engine -browser.search.defaultenginename=Google +browser.search.defaultenginename=Duck Duck Go (Lite) @@ -75,47 +75,54 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing -- --# This is the default set of web based feed handlers shown in the reader --# selection UI ++browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.2=Seeks Search ++browser.search.order.3=YaCy + + # This is the default set of web based feed handlers shown in the reader + # selection UI -browser.contentHandlers.types.0.title=Google -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=Duck Duck Go (Lite) -+browser.search.order.2=Seeks Search ++browser.contentHandlers.types.0.title= ++browser.contentHandlers.types.0.uri= ++browser.contentHandlers.types.1.title= ++browser.contentHandlers.types.1.uri= # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -- --# increment this number when anything gets changed in the list below. This will --# cause Firefox to re-read these prefs and inject any new handlers into the --# profile database. Note that "new" is defined as "has a different URL"; this --# means that it's not possible to update the name of existing handler, so --# don't make any spelling errors here. --gecko.handlerService.defaultHandlersVersion=3 -- --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: ++browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +@@ -31,15 +31,15 @@ + gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s + + # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- --# The default set of protocol handlers for irc: ++gecko.handlerService.schemes.mailto.0.name= ++gecko.handlerService.schemes.mailto.0.uriTemplate= ++gecko.handlerService.schemes.mailto.1.name= ++gecko.handlerService.schemes.mailto.1.uriTemplate= + + # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -- --# The default set of protocol handlers for ircs: ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://freenode.net/?url=%s + + # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://freenode.net/?url=%s diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html --- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300 +++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300 @@ -124,7 +131,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b

<a> anchor
- <a> a + href -+ <a> a + href ++ <a> a + href

<abbr> abbr - extended text when mouseover.
@@ -136,7 +143,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul - -+ ++

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ ++

Parabola GNU/Linux-libre

-

@getting_started@ +
Parabola GNU/Linux-libre ++
Parabola GNU/Linux-libre Wiki ++
Parabola GNU/Linux-libre Bugs

-

@firefox_heading@

+

Free Software Fundation

@@ -293,7 +297,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in -
@firefox_about@ +
Free Software Foundation +
LibrePlanet -+
Free addons ++
Free addons

diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js -- cgit v1.2.3-2-g168b From 886ff36176b0c3d2bd81880599553e464f836e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 15:50:01 -0300 Subject: mozilla-searchplugins-1.2-2: updating parabola wiki --- libre/mozilla-searchplugins/PKGBUILD | 6 +++--- libre/mozilla-searchplugins/parabola-wiki-en.xml | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 libre/mozilla-searchplugins/parabola-wiki-en.xml (limited to 'libre') diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 56b3796f4..50b4d65d2 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -20,8 +20,8 @@ source=( internet-archive.xml jamendo-en.xml logless-search.xml - parabola-gnulinux-libre-wiki-en.xml parabola-packages.xml + parabola-wiki-en.xml seeks-search.xml wikipedia.xml yacy.xml @@ -36,8 +36,8 @@ md5sums=('e1bda0854de7d764f7401c81bb82b5ef' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' - '6043b70de39481fca60a3d603a031e46' '3c4a7f901bfe9000a702c68f7f78428c' + '5bf9ca2558026fa3f4ec52d8e64fee47' '86ccb1d02683e69e6bc0543cb77a06bc' 'c35f4971feff8387e0570d7a165eb6fa' '24528ca3f7f1e1a0ba735231aa3ac1de') diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml new file mode 100644 index 000000000..d218b21f8 --- /dev/null +++ b/libre/mozilla-searchplugins/parabola-wiki-en.xml @@ -0,0 +1,11 @@ + +Parabola GNU/Linux-Libre Wiki (en) +Parabola GNU/Linux-Libre Wiki (en) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD/// +8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA== +https://wiki.parabolagnulinux.org/Special:Search + + + + \ No newline at end of file -- cgit v1.2.3-2-g168b From 85e4beaaeac5d54d385ba5fc5716c085c8b12d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 20:08:30 -0300 Subject: iceweasel-libre: deleting obsolete gcc47.patch --- libre/iceweasel-libre/gcc47.patch | 75 --------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 libre/iceweasel-libre/gcc47.patch (limited to 'libre') diff --git a/libre/iceweasel-libre/gcc47.patch b/libre/iceweasel-libre/gcc47.patch deleted file mode 100644 index 829d59510..000000000 --- a/libre/iceweasel-libre/gcc47.patch +++ /dev/null @@ -1,75 +0,0 @@ - -# HG changeset patch -# User Martin Stránský -# Date 1328886461 -3600 -# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 -# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 -Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin - -diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc ---- a/ipc/chromium/src/base/file_util_linux.cc -+++ b/ipc/chromium/src/base/file_util_linux.cc -@@ -1,15 +1,18 @@ - // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - - #include "base/file_util.h" - - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - #include - - #include "base/eintr_wrapper.h" - #include "base/file_path.h" - #include "base/string_util.h" - -diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc ---- a/ipc/chromium/src/base/message_pump_libevent.cc -+++ b/ipc/chromium/src/base/message_pump_libevent.cc -@@ -1,16 +1,19 @@ - // Copyright (c) 2008 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - - #include "base/message_pump_libevent.h" - - #include - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include "eintr_wrapper.h" - #include "base/logging.h" - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" - #include "third_party/libevent/event.h" - -diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc ---- a/ipc/chromium/src/base/time_posix.cc -+++ b/ipc/chromium/src/base/time_posix.cc -@@ -8,16 +8,19 @@ - #include - #endif - #include - #ifdef ANDROID - #include - #else - #include - #endif -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - - #include "base/basictypes.h" - #include "base/logging.h" - - namespace base { -- cgit v1.2.3-2-g168b From a6033af964c7ad41405d96cc103685917fbc9b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 20:46:52 -0300 Subject: liferea-libre-1.8.6-1: updating version --- libre/liferea-libre/PKGBUILD | 6 +++--- libre/liferea-libre/liferea.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 7a1b8cfcc..35529f458 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156321 2012-04-17 02:30:26Z eric $ +# $Id: PKGBUILD 161863 2012-06-15 23:14:52Z eric $ # Maintainer: Eric Bélanger # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('076cde160fff49a4b8c59fdae0571659ce8acd88' +sha1sums=('c469d87da4b0512270376aa360c7a955d02153c3' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 5ad87f7f6..7d812ccdb 100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install @@ -1,4 +1,4 @@ -pkgname=liferea-libre +pkgname=liferea post_install() { usr/sbin/gconfpkg --install ${pkgname} -- cgit v1.2.3-2-g168b From 0712fa72e652ba9751142e41dd405ea0ff32c282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 15 Jun 2012 23:57:44 -0300 Subject: iceape-libre-2.7.5.1-2: updating libre.patch --- libre/iceape-libre/PKGBUILD | 4 +- libre/iceape-libre/libre.patch | 102 +++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 41 deletions(-) (limited to 'libre') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index a2e3ed362..1119bc01e 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') @@ -35,7 +35,7 @@ md5sums=('7a6e671485a75cd9495f346e0f8e4dcb' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '79f99d8cda03dbcc1e88ef96776f591a') + 'b57083ca1829ba4b7188e754e192e1b0') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index fef11cbad..40854c034 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -1,15 +1,17 @@ --- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-02-16 12:08:39.000000000 -0200 -+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-05-12 05:03:27.306166002 -0300 -@@ -1,45 +1,23 @@ ++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 23:23:02.484406177 -0300 +@@ -1,23 +1,23 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing -+browser.search.order.1=DuckDuckGo ++browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.2=Seeks Search ++browser.search.order.3=YaCy # This is the default set of web based feed handlers shown in the reader # selection UI @@ -17,41 +19,50 @@ -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.contentHandlers.types.0.title=DuckDuckGo -+browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html ++browser.contentHandlers.types.0.title= ++browser.contentHandlers.types.0.uri=about:blank ++browser.contentHandlers.types.1.title= ++browser.contentHandlers.types.1.uri=about:blank # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=http://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the - # profile database. Note that "new" is defined as "has a different URL"; this - # means that it's not possible to update the name of existing handler, so - # don't make any spelling errors here. --gecko.handlerService.defaultHandlersVersion=3 -- --# The default set of protocol handlers for webcal: +@@ -27,19 +27,19 @@ + gecko.handlerService.defaultHandlersVersion=3 + + # The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: ++gecko.handlerService.schemes.webcal.0.name= ++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank + + # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- --# The default set of protocol handlers for irc: ++gecko.handlerService.schemes.mailto.0.name= ++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank ++gecko.handlerService.schemes.mailto.1.name= ++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank + + # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -- --# The default set of protocol handlers for ircs: ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ + + # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.defaultHandlersVersion=0 ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ --- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300 +++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300 @@ -47,7 +47,7 @@ @@ -59,7 +70,7 @@ // The first character after a period must be alphabetic. -pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "http://duckduckgo.com/?q="); ++pref("keyword.URL", "https://duckduckgo.com/lite/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); @@ -108,17 +119,27 @@ --- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-02-16 11:59:54.000000000 -0200 -+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-05-12 04:10:18.982249044 -0300 -@@ -4,7 +4,7 @@ ++++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-15 23:39:17.111174410 -0300 +@@ -2,20 +2,20 @@ + # + # all.js # - browser.startup.homepage=about: - browser.throbber.url=about: +-browser.startup.homepage=http://www.seamonkey-project.org/start/ +-browser.throbber.url=http://www.seamonkey-project.org/ -browser.search.defaulturl=http://www.google.com/search?q= -+browser.search.defaulturl=http://duckduckgo.com/?q= ++browser.startup.homepage=about:blank ++browser.throbber.url=about:blank ++browser.search.defaulturl=https://duckduckgo.com/lite/?q= - browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= - browser.translation.serviceDomain=translate.google.com -@@ -15,7 +15,5 @@ +-browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= +-browser.translation.serviceDomain=translate.google.com ++browser.translation.service=about:blank ++browser.translation.serviceDomain= + + #config.js + # +-startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ ++startup.homepage_override_url=about:blank # This is the default set of web based feed handlers shown in the reader # selection UI @@ -126,24 +147,27 @@ -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.contentHandlers.types.0.title=DuckDuckGo -+browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html ++browser.contentHandlers.types.0.title= ++browser.contentHandlers.types.0.uri=about:blank ++browser.contentHandlers.types.1.title= ++browser.contentHandlers.types.1.uri=about:blank --- comm-release.orig/suite/locales/en-US/chrome/common/region.properties 2012-02-16 11:59:54.000000000 -0200 -+++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-05-12 05:49:20.084819625 -0300 -@@ -1,10 +1,9 @@ ++++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-06-15 23:46:27.744272972 -0300 +@@ -1,10 +1,10 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Google -browser.search.order.2=Yahoo -+browser.search.order.1=DuckDuckGo ++browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.2=Seeks Search # More information about this update link available in the update wizard. # Only change this if you are providing localized release notes. -app.update.url.details=http://www.seamonkey-project.org/releases/ -+app.update.url.details=http://packages.debian.org/source/sid/iceape ++app.update.url.details=about:blank --- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties 2012-02-16 11:59:54.000000000 -0200 +++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties 2012-05-12 04:28:05.202481512 -0300 @@ -2,9 +2,9 @@ @@ -168,7 +192,7 @@ -

Google -
Google Groups -
Google News -+
DuckDuckGo ++
DuckDuckGo

#unfilter emptyLines @@ -238,8 +262,8 @@ spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries -app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ -app.vendorURL=http://www.seamonkey-project.org/ -+app.releaseNotesURL=http://packages.debian.org/source/sid/iceape -+app.vendorURL=http://packages.debian.org/source/sid/iceape ++app.releaseNotesURL=about:blank ++app.vendorURL=about:blank --- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in 2012-02-16 11:59:54.000000000 -0200 +++ comm-release/suite/locales/generic/profile/bookmarks.html.in 2012-05-12 04:40:19.221095752 -0300 @@ -11,37 +11,14 @@ -- cgit v1.2.3-2-g168b From 2e9f0005ea147679e68d09b352cf30565c275749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 00:04:41 -0300 Subject: iceape-libre-2.7.5.1-2: updating libre.patch --- libre/iceape-libre/PKGBUILD | 2 +- libre/iceape-libre/libre.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 1119bc01e..516695d75 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -35,7 +35,7 @@ md5sums=('7a6e671485a75cd9495f346e0f8e4dcb' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - 'b57083ca1829ba4b7188e754e192e1b0') + '251eec11c09b0003a4717f54e86703e7') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index 40854c034..fbb2de1fb 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -192,7 +192,7 @@ -

Google -
Google Groups -
Google News -+
DuckDuckGo ++
Duck Duck Go (Lite)

#unfilter emptyLines -- cgit v1.2.3-2-g168b From a01e5c23e58c4499d74165c83969da4f773ed76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 01:00:34 -0300 Subject: iceape-libre: fixing parts on libre.patch --- libre/iceape-libre/PKGBUILD | 2 +- libre/iceape-libre/libre.patch | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) (limited to 'libre') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 516695d75..25498025b 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -35,7 +35,7 @@ md5sums=('7a6e671485a75cd9495f346e0f8e4dcb' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '251eec11c09b0003a4717f54e86703e7') + '92d3feecf8d80ae6a3f06aa8c5f06eb4') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index fbb2de1fb..be471eea3 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -118,17 +118,13 @@ ---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-02-16 11:59:54.000000000 -0200 -+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-15 23:39:17.111174410 -0300 -@@ -2,20 +2,20 @@ +--- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:28:27.000000000 -0300 ++++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:52:31.135268099 -0300 +@@ -4,10 +4,10 @@ # - # all.js - # --browser.startup.homepage=http://www.seamonkey-project.org/start/ --browser.throbber.url=http://www.seamonkey-project.org/ + browser.startup.homepage=about: + browser.throbber.url=about: -browser.search.defaulturl=http://www.google.com/search?q= -+browser.startup.homepage=about:blank -+browser.throbber.url=about:blank +browser.search.defaulturl=https://duckduckgo.com/lite/?q= -browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= @@ -138,8 +134,7 @@ #config.js # --startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ -+startup.homepage_override_url=about:blank +@@ -15,7 +15,7 @@ # This is the default set of web based feed handlers shown in the reader # selection UI @@ -167,7 +162,7 @@ # More information about this update link available in the update wizard. # Only change this if you are providing localized release notes. -app.update.url.details=http://www.seamonkey-project.org/releases/ -+app.update.url.details=about:blank ++app.update.url.details=about: --- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties 2012-02-16 11:59:54.000000000 -0200 +++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties 2012-05-12 04:28:05.202481512 -0300 @@ -2,9 +2,9 @@ @@ -177,9 +172,9 @@ -messenger.throbber.url=http://www.seamonkey-project.org/ -compose.throbber.url=http://www.seamonkey-project.org/ -addressbook.throbber.url=http://www.seamonkey-project.org/ -+messenger.throbber.url=about:blank -+compose.throbber.url=about:blank -+addressbook.throbber.url=about:blank ++messenger.throbber.url=about: ++compose.throbber.url=about: ++addressbook.throbber.url=about: # To make mapit buttons to disappear in the addressbook, specify empty string. For example: # mail.addr_book.mapit_url.format= # The format for "mail.addr_book.mapit_url.format" is: @@ -203,7 +198,7 @@ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last pref("browser.startup.page", 1); -pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties"); -+pref("browser.startup.homepage", "about:blank"); ++pref("browser.startup.homepage", "about:"); pref("browser.startup.homepage.count", 1); pref("browser.warnOnQuit", true); @@ -262,8 +257,8 @@ spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries -app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ -app.vendorURL=http://www.seamonkey-project.org/ -+app.releaseNotesURL=about:blank -+app.vendorURL=about:blank ++app.releaseNotesURL=about: ++app.vendorURL=about: --- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in 2012-02-16 11:59:54.000000000 -0200 +++ comm-release/suite/locales/generic/profile/bookmarks.html.in 2012-05-12 04:40:19.221095752 -0300 @@ -11,37 +11,14 @@ -- cgit v1.2.3-2-g168b From 3144d9e25d8bb05e2c1ff69daa51a457d792f068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 03:19:57 -0300 Subject: updating iceweasel-libre package --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 19 -------- libre/iceweasel-libre/PKGBUILD | 54 +++++++--------------- libre/iceweasel-libre/libre.patch | 44 ++++++++++-------- 3 files changed, 40 insertions(+), 77 deletions(-) (limited to 'libre') 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 4da03a569..3e7149308 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 @@ -1,22 +1,3 @@ -From: Mike Hommey -Date: Tue, 5 Jun 2012 08:57:06 +0200 -Subject: Bug 756390 - Make the "Reset Firefox" feature more generic - ---- - browser/components/migration/content/migration.js | 15 ++++++++++----- - browser/components/migration/content/migration.xul | 2 +- - .../migration/src/BrowserProfileMigrators.manifest | 2 +- - .../components/migration/src/FirefoxProfileMigrator.js | 2 +- - browser/components/migration/src/ProfileMigrator.js | 4 ++++ - .../en-US/chrome/browser/migration/migration.dtd | 2 -- - .../en-US/chrome/browser/migration/migration.properties | 11 +++++------ - toolkit/content/aboutSupport.js | 8 ++++---- - toolkit/content/jar.mn | 2 +- - toolkit/content/resetProfile.js | 6 ++---- - toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++- - toolkit/xre/nsAppRunner.cpp | 2 +- - 83 files changed, 394 insertions(+), 382 deletions(-) - diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js index ffb0c34..442a5ff 100644 --- a/browser/components/migration/content/migration.js diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index b4e914356..7962c8148 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -4,6 +4,7 @@ # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): André Silva +# Contributor (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -21,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -43,7 +44,6 @@ url="http://www.geticeweasel.org/" install=iceweasel.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" mozconfig mozconfig.pgo xulrunner-copy-stub.patch @@ -53,63 +53,44 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('e440446bb92dc1c0311346c68024590b' 'cb8bfb543002a5d78db7e8661f9f87ec' - 'a9848e41461776bc4bf8d2de824b1204' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'e87d5decbb4dc0013beceaa61acfc7a1' + '54bd934ac23839601c7d23a60fbefe6a' 'e529742c0a425648087bc3ce537fe4c5' '0d053487907de4376d67d8f499c5502b' - '41ce105f0c1877fe22e0c0ec45e09565') + 'efda47526ba76ef926b236bf2cda2456') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") conflicts+=("$_pkgname") fi -dpkg-source() { - # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc +build() { export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - mv mozilla-release "${_debname}-${_debver}" - mv debian "${_debname}-${_debver}" - cd "${_debname}-${_debver}" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + export DEBIAN_BUILD="mozilla-release" + mv debian "${srcdir}/${DEBIAN_BUILD}" + cd "${srcdir}/${DEBIAN_BUILD}" -# Doesn't apply and seems unimportant + # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true -# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true quilt push -a - find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? - cd .. -} -build() { -# Don't run this if we're using -e -if [ $NOEXTRACT -eq 0 ]; then - msg2 "Applying Debian patches..." - cd "${srcdir}" - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc - - msg2 "Starting normal build..." - mv "${_debname}-${_debver}" "$srcdir/mozilla-build" - cd "$srcdir/mozilla-build" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" -# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" - -fi - - cd "$srcdir/mozilla-build" - + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig fi @@ -132,9 +113,6 @@ fi echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -145,7 +123,7 @@ fi } package() { - cd "$srcdir/mozilla-build" + cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="$pkgdir" install install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index e726a58e9..39ea86c05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -10,8 +10,8 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); -+pref("extensions.getAddons.get.url", ""); +pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); +pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); +pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); +pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); @@ -23,7 +23,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow // Dictionary download preference -pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", ""); ++pref("browser.dictionaries.download.url", "about:blank"); // The minimum delay in seconds for the timer to fire. // default=2 minutes @@ -86,9 +86,9 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri= ++browser.contentHandlers.types.0.uri=about:blank +browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri= ++browser.contentHandlers.types.1.uri=about:blank # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site @@ -106,7 +106,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate= ++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail @@ -114,9 +114,9 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate= ++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank +gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate= ++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit @@ -214,9 +214,9 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -browser.contentHandlers.types.1.title=Google -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s +browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri= ++browser.contentHandlers.types.0.uri=about:blank +browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri= ++browser.contentHandlers.types.1.uri=about:blank # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= @@ -231,7 +231,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate= ++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank # The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail @@ -239,9 +239,9 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate= ++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank +gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate= ++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js --- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300 +++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300 @@ -276,28 +276,32 @@ diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region. diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in --- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 15:11:46.364192476 -0300 -@@ -10,14 +10,16 @@ -

++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300 +@@ -11,13 +11,20 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ -+

Parabola GNU/Linux-libre

-

@getting_started@ -+
Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Bugs ++
Parabola GNU/Linux-libre

-

@firefox_heading@

-+

Free Software Fundation

++

Parabola GNU/Linux-libre

-

@firefox_help@ -
@firefox_customize@ -
@firefox_community@ -
@firefox_about@ ++
Parabola GNU/Linux-libre ++
Parabola GNU/Linux-libre Packages ++
Parabola GNU/Linux-libre Wiki ++
Parabola GNU/Linux-libre Labs ++

++

Free Software Foundation

++

+

Free Software Foundation +
LibrePlanet +
Free addons ++
h-node

diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js -- cgit v1.2.3-2-g168b From 406f8bf5fb52606aee78dd2f553739ce1c03f2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 15:15:48 -0300 Subject: iceweasel-libre-13.0.1.1-1: updating version --- libre/iceweasel-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 7962c8148..8a407aee3 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel -_debver=13.0 +_debver=13.0.1 _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=4 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -51,8 +51,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" iceweasel-install-dir.patch vendor.js Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('e440446bb92dc1c0311346c68024590b' - 'cb8bfb543002a5d78db7e8661f9f87ec' +md5sums=('9eb7668e4a5b5be63ccf4d43c212d011' + 'f3ac4e2f52965335ccf13588255e6db4' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' -- cgit v1.2.3-2-g168b From 1202d543cfd8884bcd7529e59c614c536103d2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 18:54:17 -0300 Subject: iceweasel-i18n-13.0.1.1-1: updating version --- libre/iceweasel-i18n/PKGBUILD | 172 +++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'libre') diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 8e03cb882..0b66a685c 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,7 +9,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=13.0 +_debver=13.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=10.0 +_pkgver=13.0.1 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('e35b6b08fb314569174a12fb5d289f21' - 'f7b4e4e93fc8a34b38af201d3dc5665d' - '16b41103c5ae2325884d266a4fa6ef2e' - '86829f63977541a6f8b241b352891fc8' - '442b5518d9e91a577de05e5e7bd4c1a3' - '771de4f956802cd2199e9a153ad7e93b' - '55612034c6b9aed03268f9387f6af846' - '00a47e3c42377a060d3b73a015a53615' - '10b1bd554a5390b15e441ee631663052' - '54780d957f68d12c1a22a014b099f504' - 'dcdbb703a40aec783f62a994765a6298' - 'eddaa79e00457f6a8ecab407fac979b1' - '49b6f4928bc1d0411368809ba47580b3' - 'd0570b0084e5ec860626887e08ccdd90' - 'a19c12048002e057afc3d1ca5bae4ad9' - '0a492ec08fa304b4bf6d83a65b549ff9' - '76f67c9ee46feca9d18d2bb30014816f' - 'c3d9f562c28598307c740e4d4dd7348e' - '7567922156989828cd5c0e28a315e195' - 'df91ab90a3e1fef34f5848a9f6444468' - '7d8e45e6e3da8b7d4a1cf94548583262' - 'a661b6a102c5d98de9649d86cab880e0' - '51695205bfdddf982bb746cf4468ea1b' - '19de09fc98cde75bfa88c5274eff7cae' - 'a59ef12c791749a6eca60ee001617751' - '53cbe9dfb8b124d579fcabaf8dcfafce' - '44de34e679070df84e74dee75c70c544' - 'ee98508a21f6ff480f65924c1069965d' - '9827926ba6f4bba2858410b998fcb05b' - '0833c07b595ce249a384b1dda8f34963' - '0f3f0c3cf0813e91f570141b7e0212a4' - 'f6fd9346dc9a0c16058ad765a808809b' - '8284e350944633e38c86d3ce6b30a23e' - 'f67a900d496426c87478ad9bbc6ebbb0' - '3d67d29fcf015a4726a3b63c3e56efa6' - 'a4dd7eecd30aa8e5675239ecb2aac643' - '17e14278b65190304b174fe2cb7f0ba7' - '7919d3e268fbe9a9385ae61da767972a' - '8ca4ea94c9433fa93270d6942f7bbdca' - '163c71e0d58891e4e4812c6f410b34e3' - '3e343f4039ba87817cbe4209f0828da2' - 'c0993d2d4409635d5a5cc55a5dc22afa' - '9e9ebb4b90e64dc3bda9912ec68f5919' - 'bf8f1b84ea8dbea3b35bef433cf0f513' - 'f3c00bf1812f3f2ed940372100ef6baa' - 'b8789e2547a5c507297fd75d10c61e47' - '8cafb2f5804a985f521d0fd8c4ac38e6' - 'e74a59d6927b4f56804a412a70354be2' - '4d680519a811201ebf57944201c92522' - 'fe24a7f2620b8743604784bc56600b0f' - 'dfdb2c6b135ab98e2652c19136496c12' - '504fdcaf8730829d5c6d48b5fa8c89a8' - '459400531f8414c5b527a98cf5c854cd' - 'b24b7067ba0a293f12e23a80998de2b8' - '2ffebdb22377309bacfa4f35e78e53ee' - '7f32199165b0aeca6dffb43ddd4e7934' - '9cddba25c3042a29d43e7d986ae9a2fe' - 'b10c6b5ba44de100402a451fb0f87a0b' - '7ff013fd4b1eb6343d4d94c80697b0b8' - '24987ec9124fe40503d6218943f7f2c1' - '88ccdd6115de5e0e121aba11d8881f9d' - 'f53d6573ab123cc740edff0a0f051214' - 'bb8ebd84fbb6e85716633730986f8afb' - '308ab080c1a1978916d50277d7b1e170' - '6954762d9100f3f59f83a04833c6fc8b' - '11cbdb81af5cb5691b362a6fbb54522e' - '06df7af5c296be68853fbcaf6c11d354' - '321f8f412ad21213ee4bc9e5831e6061' - '4f7177bab3fb5e3f31f954e73403803f' - '6edd087d6c667739687426922961cdcf' - 'b3d74b6ceab4befa4c42d245cbdfdbe4' - '3f6df88d121bd305740014e1677328f8' - 'df58cc660670b906925aa22a5136aeaf' - '590727cebf9bdb599358b4b2d3ed40f9' - 'f4d0f0184e77f3ea9585296b820de2cd' - 'd074f5f4167585fc62ae802b7929669e' - 'd5810f44cc19b5629183da39b234f92c' - '777d7caca99c317c3e71f464f53983d6' - 'f9cfe429a139e450c3bb859d2224441c' - '468a90cc6648bd4ed7b39afc3e3dc253' - 'de53d77cc1cd0126de3f00ddc24afe08' - 'dddedd2b83b3083ce01ae25824a2eaf5' - '1e3122decb28bf37b630f84b05e02be8' - '9666c6e23b39f07d3b0b286e7514e3fd') +md5sums=('07de8f16a6a2a4bf5fbb0760179b17d1' + 'a98192e2537d6992b6b8a88cbfaf1b49' + '17ed508a8d454ac788f9f164b6b56d6d' + '44dc0cd60fe723188f8e02c427cd263f' + '09717f8e714ebd409d5a1e24f061f623' + '97f5e58e47274d027d7b82da3e6ef03b' + '26e9945f49015f5d9fa9951f4d12145e' + '0eddf320afc250675b481c1095a79652' + 'c4bcaaccff6c54d65a65123ff70efc0f' + '7ff5c522c0d6626e08f3d478a6666ae5' + 'ac184954d813badf15f02bd7836f5743' + '58a1653b8181c43d883b9046e0a77450' + '13a01ceff0e22a62dc8a2789c06419ab' + '7afa0ae711fb4715bc198bce21b608f4' + '5a9f0fa2ab1ca73d066c02b6b44b4a7c' + '6dda3b7858f02b62348555dc5563ea3f' + '4ce588323dd2597d586cfbfe06dc4c6a' + '9b4b79badc1a8c7e5dd86b9bd7d935ba' + 'bccee717e3470517d942da2fde004e3f' + '7b503acbbe9c12904b19d109c282a6e9' + '77acc15abff7211f6ba736f80e1599c6' + 'eb2deeebf4cd679ca186074569569823' + '1e1166b21d96de0d7cce3077eb2b1a22' + '0532ee3a54b8947bb5fd7c5eff465208' + '87b44d3ea3e690d14da39a58d91b434c' + '78c9e42e5052d5dbb5637159dce97b47' + '07f4b9b91e9b8e30d3ffa74648134554' + '9f141d82867364447cde7ec556512944' + 'c49720f13109526ce69dc6406742b835' + '05133846f5f078af41d26a9def62295b' + '95efc32d6dc811ea374c922826dbc645' + 'abdaaa429e40ddd50eade2d85dce2db5' + '326a061b850fa8b66f71460762e6024b' + 'c0b153e30ebb738ba66797b1ea0d6fd1' + '49695dc9a361cd8469ccabc3b398cbff' + 'f2a09eabf09e911f013aff4647bdab2e' + '0eaf712a48a5977cb141dbc6343ed05a' + 'c3e51cdc2cecfa9b31fac42c4c756f86' + 'f8f8657a9067e937bcd05ee69b24927f' + '45b545edca5bd7d9c084c427ff03a4f2' + '26b9dd9f45a66945cb5c9fbb518c1add' + '421c80704ba82406f35d5a3b1f41ce6a' + '5634ecd7cafd3358cefaa3c163081909' + 'ef2a5ea522d22a9abc351d587d86896c' + '41f3bbc82d237fe49b3aafcb37ef00b0' + '72c232686a199d5d277b4fd582955871' + '5387c0b061c4d6edc5a2ce16f4119ed3' + '746f58462e5f71f7d59a1aacf826c2a0' + '054c91c8dc78887ca215d4979bac2a09' + 'fd84d6b4194a470a533078c1d3acab19' + '5da90e0d38472ddd8f52e9a698923fb2' + '7fd67e0e1b6e0cf943e36769acfbfe01' + '947b7fbc3b8c1f7186aebb4ca0e2ad44' + '52788821e7b965933702f6a53f157df0' + 'ecba8c0012139cbdbf9bcda6469bffd7' + 'fd1016b74b3c144cebeb7a16c63c2bce' + '768e136d70d159e2add5c57da4fccc0d' + '485e1346782ea1542c4de7f185580356' + '90926400fa3276a07cd7aec1038b91b0' + '2c0dcc8b714c99d4935e8fda3c64f405' + 'c105c9a26a9a50179214576608239feb' + '01085c57f8eea3ea123176137d358450' + 'd35ff3437edf8401430f7a0b46874560' + '1a6982c3a31535b4fde37f7ad74b1a64' + '1d2e2240610562226bf8ea11b40b5798' + 'bf19ff0e5db922be55bd4671011704b9' + '697fe39a23039e8f9585b93da9c92b7b' + 'cf049968648a5a0405fe806bae793862' + '75e6b45c5b01f6d6625e78ac4f8a33db' + '7076ebd64d047287cd28bfdcbdd2bb76' + '954ad4218b885979e195bd63e3f19167' + 'cce30718534ff1bd2fa5157dcc0716d7' + '0f5af58a538fd95361530411987ca4a4' + '044a6eb119eae529abd45206b20bfe19' + '56eb21683a94f44ae4489565944c2bd3' + 'ce458ae1e8540ba3779f25f0767a95a2' + '949092ed264324730628e0efd79980ce' + '6fa503ded08d55fe023117f51369e495' + '8c1f8e9a30cfe4abc4036f872443214e' + '9b8350839b01308571ff3f06a33ec68f' + 'f0339a009db45334d0d8fcdc2bb75f2c' + 'c2df9fcf1e1afa9442738d7200faf5b1' + 'ca3f98e4d04dfa69fc0dafd0a95cd01e' + '039e06c1d18711becac9ceee56905f1d') -- cgit v1.2.3-2-g168b From 65f5153200b00a5a583b23b2008b7c202678fbb0 Mon Sep 17 00:00:00 2001 From: Jorginho Date: Sun, 17 Jun 2012 02:44:59 +0200 Subject: solve a problem --- libre/cups-filters-libre/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 libre/cups-filters-libre/PKGBUILD (limited to 'libre') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD new file mode 100644 index 000000000..09db17876 --- /dev/null +++ b/libre/cups-filters-libre/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Andreas Radke + +pkgname=cups-filters-libre +_pkgname=cups-filters +pkgver=1.0.18 +pkgrel=2.1 +pkgdesc="OpenPrinting CUPS Filters" +arch=('i686' 'x86_64') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +depends=('lcms2' 'poppler') +makedepends=('ghostscript') +optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') +backup=(etc/fonts/conf.d/99pdftoopvp.conf) +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) +md5sums=(63972b426b7224915cdbb42b2a937374'') + +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + #make DESTDIR="$pkgdir/" install + make install BUILDROOT="$pkgdir/" + # drop static lib + rm -f ${pkgdir}/usr/lib/*.a +} -- cgit v1.2.3-2-g168b From f6945c0ef1d0abe1b40d5702a9b9edab11063c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 23:29:02 -0300 Subject: icecat-12.0-1: update package --- libre/icecat/PKGBUILD | 67 ++++-- libre/icecat/cairo.patch | 43 ++++ libre/icecat/firefox-install-dir.patch | 28 --- libre/icecat/gcc47.patch | 75 +++++++ libre/icecat/icecat-install-dir.patch | 28 +++ libre/icecat/libre.patch | 374 ++++++++++++++++++++++++++++++--- libre/icecat/mozconfig | 8 +- libre/icecat/mozconfig.default | 63 ------ libre/icecat/mozconfig.firefox | 46 ---- libre/icecat/mozconfig.old | 78 ------- libre/icecat/vendor.js | 4 + libre/icecat/xulrunner-copy-stub.patch | 11 + 12 files changed, 553 insertions(+), 272 deletions(-) create mode 100644 libre/icecat/cairo.patch delete mode 100644 libre/icecat/firefox-install-dir.patch create mode 100644 libre/icecat/gcc47.patch create mode 100644 libre/icecat/icecat-install-dir.patch delete mode 100644 libre/icecat/mozconfig.default delete mode 100644 libre/icecat/mozconfig.firefox delete mode 100644 libre/icecat/mozconfig.old create mode 100644 libre/icecat/xulrunner-copy-stub.patch (limited to 'libre') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 79274ce21..ebd5a1350 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -4,6 +4,7 @@ # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): emulatorman +# Contributor (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -15,7 +16,7 @@ _pgo=false _pkgname=icecat -pkgver=10.0 +pkgver=12.0 pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi @@ -47,13 +48,15 @@ depends=( makedepends=( 'autoconf2.13' 'diffutils' + 'imagemagick' 'libidl2' + 'librsvg' + 'libxslt' 'mesa' 'pkg-config' 'python2' 'unzip' 'wireless_tools' - 'yasm' 'zip' ) if $_pgo; then @@ -66,12 +69,26 @@ install=icecat.install source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig mozconfig.pgo + xulrunner-copy-stub.patch + libre.patch icecat.desktop icecat-safe.desktop - libre.patch - firefox-install-dir.patch + icecat-install-dir.patch vendor.js - libvpx.patch) + gcc47.patch + cairo.patch) + +md5sums=('04a5504c5c473354bcd20f7116360fee' + '3117865902d1a20ab61d75707be9888e' + 'ac29b01c189f20abae2f3eef1618ffc0' + '683c4540ab84c220937feb7d1a1450ee' + 'd403b0ae09306fef3870132e7fd33ed2' + 'e81ad01dbc16ba28bf92ba4b7c309ca7' + 'd93fe402b87cd000a869e1fd6badc6c9' + '268e65c8fcae6152e156c09760a18dfd' + '0d053487907de4376d67d8f499c5502b' + '79e471e0bd03b1d4e84fd3a6776bd619' + '721c59ffc14f14cb0d3a90b7e84df70e') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname") @@ -79,13 +96,18 @@ if [ "$_pkgname" != "$pkgname" ]; then fi build() { + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" mv "$_pkgname-$pkgver" "$srcdir/mozilla-build" cd "$srcdir/mozilla-build" - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch - patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname + patch -Np1 -i "$srcdir/icecat-install-dir.patch" # install to /usr/lib/$pkgname + patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff - patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch + patch -Np1 -i "$srcdir/gcc47.patch" + patch -Np1 -i "$srcdir/cairo.patch" + + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch if $_pgo; then cat "$srcdir/mozconfig.pgo" >> .mozconfig @@ -95,8 +117,21 @@ build() { sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" + # This is a bug, we should fix it. + if [ "$CARCH" = "mips64el" ]; then + # Fix MIPS N32 support. + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + js/src/assembler/wtf/Platform.h + # Disable JIT. + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in + echo 'ac_add_options --disable-methodjit' >> .mozconfig + echo 'ac_add_options --disable-tracejit' >> .mozconfig + echo 'ac_add_options --disable-jemalloc' >> .mozconfig + fi + + chmod +x build/unix/run-icecat.sh # fix bug for bad file permition if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & @@ -133,18 +168,8 @@ package() { rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # Fix a bug with https-everywhere (duplicate rules) - rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" + #rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } - -md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' - '6f3a8fd65c416216a1b56b0c2d2d81aa' - 'ac29b01c189f20abae2f3eef1618ffc0' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - '145f453ef82f643711c10d97ec57a805' - '1e4bcac59e93d21fffa6a1d1ad235247' - 'c382e35315047e4ca368d09383b39b8d' - '5d418ecdbdb9f40597df6b978b0b5ee5') diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch new file mode 100644 index 000000000..981eff883 --- /dev/null +++ b/libre/icecat/cairo.patch @@ -0,0 +1,43 @@ +From: Uli Schlachter +Date: Thu, 17 May 2012 10:51:11 +0200 +Subject: Bug 722975 - Make system cairo work again + +--- + gfx/thebes/gfxPlatform.cpp | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp +index fb06fba..a0edefc 100644 +--- a/gfx/thebes/gfxPlatform.cpp ++++ b/gfx/thebes/gfxPlatform.cpp +@@ -436,11 +436,9 @@ void SourceBufferDestroy(void *srcBuffer) + static_cast(srcBuffer)->Release(); + } + +-void SourceSnapshotDetached(cairo_surface_t *nullSurf) ++void SourceSnapshotDetached(void *nullSurf) + { +- gfxImageSurface* origSurf = +- static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); +- ++ gfxImageSurface *origSurf = static_cast(nullSurf); + origSurf->SetData(&kSourceSurface, NULL, NULL); + } + +@@ -512,14 +510,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa + imgSurface->Stride(), + format); + +- cairo_surface_t *nullSurf = +- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); +- cairo_surface_set_user_data(nullSurf, +- &kSourceSurface, +- imgSurface, +- NULL); +- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); +- cairo_surface_destroy(nullSurf); ++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", ++ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get()); + } + + srcBuffer->AddRef(); diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch deleted file mode 100644 index b6f9700b3..000000000 --- a/libre/icecat/firefox-install-dir.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in ---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 -+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 -@@ -68,8 +68,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in ---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 -+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 -@@ -61,8 +61,8 @@ - datadir = @datadir@ - mandir = @mandir@ - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - TOP_DIST = @TOP_DIST@ - ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/libre/icecat/gcc47.patch b/libre/icecat/gcc47.patch new file mode 100644 index 000000000..829d59510 --- /dev/null +++ b/libre/icecat/gcc47.patch @@ -0,0 +1,75 @@ + +# HG changeset patch +# User Martin Stránský +# Date 1328886461 -3600 +# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 +# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 +Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/file_util.h" + + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + #include + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include + #endif + #include + #ifdef ANDROID + #include + #else + #include + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch new file mode 100644 index 000000000..6609650da --- /dev/null +++ b/libre/icecat/icecat-install-dir.patch @@ -0,0 +1,28 @@ +diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk.in +--- icecat-12.0.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500 ++++ icecat-12.0/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500 +@@ -74,8 +74,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur icecat-12.0.orig/js/src/config/autoconf.mk.in icecat-12.0/js/src/config/autoconf.mk.in +--- icecat-12.0.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500 ++++ icecat-12.0/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500 +@@ -60,8 +60,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 3dca93ee7..ff7f6f4ed 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,66 +1,370 @@ ---- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-26 23:11:39.000000000 -0500 -+++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-26 23:12:15.000000000 -0500 -@@ -74,7 +76,7 @@ +diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js +--- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300 ++++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300 +@@ -64,10 +64,11 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); + pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); + pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -81,7 +82,7 @@ pref("extensions.update.autoUpdateDefault", true); // Dictionary download preference -pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/"); ++pref("browser.dictionaries.download.url", "about:blank"); // The minimum delay in seconds for the timer to fire. // default=2 minutes -@@ -876,7 +878,7 @@ - pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); - - // base url for the wifi geolocation network provider --pref("geo.wifi.uri", "https://www.google.com/loc/json"); -+pref("geo.wifi.uri", "http://geomena.org"); - pref("geo.wifi.protocol", 0); - - // Whether to use a panel that looks like an OS X sheet for customization ---- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 07:34:23.000000000 -0500 -+++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 19:59:04.000000000 -0500 -@@ -1,27 +1,19 @@ +@@ -242,7 +243,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:home"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300 +@@ -1,28 +1,28 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (SSL) ++browser.search.defaultenginename=Duck Duck Go (Lite) # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google --browser.search.order.2=Yahoo -+browser.search.order.1=Duck Duck Go (SSL) -+browser.search.order.2=Duck Duck Go (Lite) +-browser.search.order.1=Duck Duck Go +-browser.search.order.2=Google +-browser.search.order.3=Yahoo ++browser.search.order.1=Duck Duck Go (Lite) ++browser.search.order.2=Seeks Search ++browser.search.order.3=YaCy --# This is the default set of web based feed handlers shown in the reader --# selection UI + # This is the default set of web based feed handlers shown in the reader + # selection UI -browser.contentHandlers.types.0.title=Bloglines -browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s -browser.contentHandlers.types.1.title=My Yahoo -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.2.title=Google -browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s ++browser.contentHandlers.types.0.title= ++browser.contentHandlers.types.0.uri=about:blank ++browser.contentHandlers.types.1.title= ++browser.contentHandlers.types.1.uri=about:blank ++browser.contentHandlers.types.2.title= ++browser.contentHandlers.types.2.uri=about:blank # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+keyword.URL=https://duckduckgo.com/?q= ++keyword.URL=https://duckduckgo.com/lite/?q= # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the ---- icecat-9.0.1.orig/browser/app/Makefile.in 2011-12-27 00:22:26.000000000 -0500 -+++ icecat-9.0.1/browser/app/Makefile.in 2011-12-27 00:23:10.000000000 -0500 -@@ -269,7 +269,7 @@ - else - ifdef LIBXUL_SDK - libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) -+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) - endif - endif +diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html +--- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300 ++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300 +@@ -143,7 +143,7 @@ +

+

+ <a> anchor
+- <a> a + href ++ <a> a + href +

+

+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul +--- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300 ++++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300 +@@ -294,6 +294,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+-

@getting_started@ ++
Parabola GNU/Linux-libre +

+-

@firefox_heading@

++

Parabola GNU/Linux-libre

+

+-

@firefox_help@ +-
@firefox_customize@ +-
@firefox_community@ +-
@firefox_about@ ++
Parabola GNU/Linux-libre ++
Parabola GNU/Linux-libre Packages ++
Parabola GNU/Linux-libre Wiki ++
Parabola GNU/Linux-libre Labs ++

++

Free Software Foundation

++

++

Free Software Foundation ++
LibrePlanet ++
Free addons ++
h-node +

+

+diff -urN iceweasel-13.0.orig/browser/base/content/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js +--- mozilla-release.orig/browser/base/content/aboutHome.js 2012-06-01 09:03:47.000000000 -0300 ++++ mozilla-release/browser/base/content/aboutHome.js 2012-06-13 18:07:51.217531774 -0300 +@@ -37,104 +37,6 @@ + * + * ***** END LICENSE BLOCK ***** */ + +-// If a definition requires additional params, check that the final search url +-// is handled correctly by the engine. +-const SEARCH_ENGINES = { +- "Google": { +- image: "data:image/png;base64," + +- "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" +- , params: "source=hp&channel=np" +- } +- +-, "Яндекс": +- { +- image: "data:image/png;base64," + +- "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" +- } +-}; +- + // The process of adding a new default snippet involves: + // * add a new entity to aboutHome.dtd + // * add a for it in aboutHome.xhtml +@@ -142,7 +44,7 @@ + // The 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://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2" + ]; + const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index b769079d8..c09eacaca 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -37,7 +37,7 @@ export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir -# IceCat +# Icecat export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 @@ -46,6 +46,12 @@ ac_add_options --with-branding=browser/branding/unofficial ac_add_options --with-distribution-id=org.gnu.gnuzilla ac_add_options --with-user-appdir=.gnuzilla +# ConnochaetOS +#ac_add_options --build=i586-pc-linux-gnu +#ac_add_options --host=i586-pc-linux-gnu +#export USE_SHORT_LIBNAME=1 +#mk_add_options USE_SHORT_LIBNAME=1 + # Parabola ac_add_options --disable-safe-browsing export BUILD_OFFICIAL=1 diff --git a/libre/icecat/mozconfig.default b/libre/icecat/mozconfig.default deleted file mode 100644 index 01e047fc3..000000000 --- a/libre/icecat/mozconfig.default +++ /dev/null @@ -1,63 +0,0 @@ -# This is a better commented version of the default .mozconfig from 9.0.1 -ac_add_options --enable-application=browser - -ac_add_options --prefix=/usr/local -#ac_add_options --with-default-mozilla-five-home=/usr/local/lib - -# System libraries -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -#ac_add_options --with-system-png -ac_add_options --disable-system-cairo -#ac_add_options --with-pthreads - -ac_add_options --disable-toolkit-qt -ac_add_options --enable-toolkit-cairo-gtk2 -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-svg-renderer=cairo - -# Features -ac_add_options --enable-extensions="default spellcheck" -ac_add_options --enable-freetype2 -ac_add_options --enable-pango -ac_add_options --enable-crypto -#ac_add_options --enable-postscript -ac_add_options --enable-svg -ac_add_options --enable-xft - -ac_add_options --disable-chatzilla -ac_add_options --disable-accessibility -ac_add_options --disable-calendar -ac_add_options --disable-composer - -#ac_add_options --disable-jsd -#ac_add_options --disable-libxul -ac_add_options --disable-ipc -ac_add_options --disable-ldap -ac_add_options --disable-mailnews -ac_add_options --disable-negotiateauth -ac_add_options --disable-profilesharing -ac_add_options --disable-xinerama -ac_add_options --disable-xprint - -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -ac_add_options --disable-debug - -# Optimization -ac_add_options --disable-elf-dynstr-gc -ac_add_options --enable-optimize="-pipe -O3" -ac_add_options --enable-strip - -# IceCat -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 - -ac_add_options --disable-official-branding -ac_add_options --with-branding=browser/branding/unofficial -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla diff --git a/libre/icecat/mozconfig.firefox b/libre/icecat/mozconfig.firefox deleted file mode 100644 index 428503642..000000000 --- a/libre/icecat/mozconfig.firefox +++ /dev/null @@ -1,46 +0,0 @@ -# This is the .mozconfig used by Arch for Firefox -. $topsrcdir/browser/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -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-official-branding -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -# PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/libre/icecat/mozconfig.old b/libre/icecat/mozconfig.old deleted file mode 100644 index a790aee48..000000000 --- a/libre/icecat/mozconfig.old +++ /dev/null @@ -1,78 +0,0 @@ -# This is a better commented version of the .mozconfig used by the Parabola -# package < v9 -. $topsrcdir/browser/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-cairo -ac_add_options --with-pthreads - -ac_add_options --enable-default-toolkit=cairo-gtk2 - -# Features -ac_add_options --enable-extensions=default - -ac_add_options --enable-url-classifier -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --enable-canvas -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-smil -ac_add_options --enable-svg - -ac_add_options --disable-javaxpcom -ac_add_options --enable-libnotify -ac_add_options --enable-printing -ac_add_options --enable-xinerama -ac_add_options --enable-xterm-updates - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-update -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -ac_add_options --disable-debug - -# Optimization -ac_add_options --disable-pedantic -ac_add_options --disable-static -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-optimize -ac_add_options --enable-strip - -# PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 - -# IceCat -ac_add_options --disable-official-branding -ac_add_options --with-branding=browser/branding/unofficial -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla - -# Parabola -ac_add_options --disable-safe-browsing -export BUILD_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js index 808d1b118..d8d606bc1 100644 --- a/libre/icecat/vendor.js +++ b/libre/icecat/vendor.js @@ -3,3 +3,7 @@ pref("intl.locale.matchOS", true); // Disable default browser checking. pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch new file mode 100644 index 000000000..d69bb4b16 --- /dev/null +++ b/libre/icecat/xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- icecat-12.0/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 ++++ icecat-12.0/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 +@@ -224,7 +224,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + -- cgit v1.2.3-2-g168b From f9e77393cd9532c6fb02108c57a501ef87f6c20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sat, 16 Jun 2012 23:32:53 -0300 Subject: icecat-12.0-1: remove libvpx.patch --- libre/icecat/libvpx.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 libre/icecat/libvpx.patch (limited to 'libre') diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch deleted file mode 100644 index f883b8e08..000000000 --- a/libre/icecat/libvpx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in ---- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 -+++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 -@@ -5629,7 +5629,7 @@ - dnl v0.9.6 one to check for. - AC_TRY_COMPILE([ - #include -- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) -+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) - #error "test failed." - #endif - ], -- cgit v1.2.3-2-g168b From 150da4d272890ab43d0a88d6cad33f1d3e5e97b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 17 Jun 2012 01:06:46 -0300 Subject: updating icecat-12.0-1 languages --- libre/icecat-i18n/PKGBUILD | 178 +++++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 87 deletions(-) (limited to 'libre') diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index f995939da..4be40b872 100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD @@ -2,6 +2,7 @@ # Contributor: fauno # Contributor: Figue # Contributor: emulatorman + # Based on firefox-i18n package # When updating to a newer upstream release: @@ -9,14 +10,14 @@ # - (optionally) edit PKGBUILD.in # - Run 'make'. It will take care of everything else for you. -_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) +_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) pkgbase='icecat-i18n' pkgname=($(for lang in ${_langpacks[@]} do echo icecat-i18n-$lang | tr A-Z a-z done)) -_pkgver=10.0 -pkgver=10.0 +_pkgver=12.0 +pkgver=12.0 pkgrel=1 pkgdesc="Language packs for GNUzilla IceCat." arch=('any') @@ -24,7 +25,7 @@ license=('MPL') url="http://www.gnu.org/software/gnuzilla/" depends=("icecat=${pkgver}") source=($(for lang in ${_langpacks[@]} - do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi + do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi done)) noextract=($(for lang in ${_langpacks[@]} do echo $lang.xpi @@ -45,86 +46,89 @@ package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { " done -md5sums=('6d4c69921bbdfe92c0fd31873983d426' - '4e994c70c93e4d266d273d2358f7acf3' - 'd783c592edfa96d6abecd1efa1aa1b5e' - '70b8badcddb6d5cf6b226c0f0141b463' - 'bcfe52114b1c0f5346594452117bec5d' - '7d8900839fcf5972a91c4ce1a1bdd7c6' - 'd9720bf726a8f6fde0dc94e6e73863a9' - 'ce61734ab226dc041b55e95c9b6f9d92' - '965c2ec576ac41e7351e159f516ec65f' - '4feb78e0dd79606f416b8ab46432ad41' - '61989146fe89320c847e4de6261a06ff' - '260f3abb8612248493060e2dec6f0a22' - '6b49d830c47717001250236c9cc933a5' - '338137d425c8e6ae98796f3cc9a0550f' - '4ddf33cc1af9d3ad483d8fc47609aee3' - 'e04918865a21260b8eaf27b3dc84ade5' - '59961e347c4fe3816f809f456bc9a2b8' - '262ad46f6c6e8a89eb29b590cc092eb9' - 'e9452d83d914605f06c055c00325bf6b' - 'ae652d7db9b3cd3cba85306d16a7a599' - '04fec5cd927a57ac6c9780a9f42444e1' - '70ba3ec972f01e75b144e106afacd8ac' - 'f1ee7deccf3c73083b51c5741722b120' - 'ca5566a24ee4fd38a3a907bfb5d72975' - 'd4717e5c3e44fbaebe4eaf99f0195120' - '907c42bdaa3af02c39bef5d83198f8a9' - '7afa1ac8645657722cdf3415244e4686' - 'd3d780b6c8d179c68065d9bec19dce48' - '09fae6ea53f5435ccfdbf41f660378ee' - '043306182ec497280b3ea78dcbd7b7d3' - '8a481d0d41f22d5bc65ed7844a0d7c27' - '2a8648998f2aafd307511e043cd8564d' - 'e7fbc4b7364d151edac9840b90949f56' - 'e2ea49277375825f612bcfb225dcb0a0' - '9fb2a20a2222a0d814a3f48d7208d820' - '88976bac6b9e647f4d17ab1638f12601' - 'a6a39406914459deaefb3403e94dfa39' - 'd3acecff63909d946fb549520785ef99' - 'a8327a1a525330ca9ef8e3f9d50ca5f8' - 'ba3ad9e8843b0de408a72896183985d6' - '3dfb48ecea5eda9f0e3e05295eb3c82b' - '95a1e7e2ec604409b54f1ded4ee7accf' - '69ebeb59c7ff4e0452c9f0998db65ef0' - '7bdf97288cef0d14ff1521db063cd20c' - '8f50cfa1e8c788b7b839273848dc2834' - '3aa0631dc6a53581cf53d559b27a0ee3' - '45e7238e0d0e427df04d3ba91ca045cd' - 'b992cfa2b0440486cd70fd6ab9e32deb' - '3a9fac821e039556f7d009080daec643' - '6872abed4f4d4b81cf5f0b7b656846c7' - 'eb44e902c6a6186c85dca8aff1d5b95f' - '21f5aeacbb233167218ab7f1b34efdce' - 'b97e29d866ae1ed422d0a1c4327cfd49' - '5cce41015e73c36944224f827ac5a8d1' - 'a13ac7293acc75015f0034d77ddb0f30' - '38c84e214af65ed6f059ad524c923dc9' - '66c8d82875f55f67167048e3d6888d8f' - '4ec423b8e34a4de058b115fd5918e0b2' - '0026e20db1bad1eaf692bd0b2043c038' - '31f029a6665ccae9b4c8cac9eda06c6f' - 'e72ffe020543ca0ad4f8be2aad9e90a9' - '7b75e8fb1cd8ae34023b312d2214029a' - '88b1a96268e08f65579b2fe6d7677b73' - '4418d687e4dcb313fd59247844eab93c' - 'b200a045163b7c09cde85b82013fec98' - '263f6ff19491b68865bcab4309dff0a8' - '80d0fb352eb1f252c355d3b8388d3513' - 'dd79b0c4d959f46852e1e23b0cc984af' - 'db51a6767331bb3a8c0a1e0f5f35d968' - '3155d4cafe5f90ec83336ddd07183629' - 'b9246693498e1ec3c5b4dffa8145d04e' - '770bf78f2a0c6522e641e61e44617b40' - 'aadf3a6f9517c76e2b37867cb1a654c6' - '3530c75b3c2311d8127f20df7bd724da' - 'ef3bfc5db8197edb095da10390d8e058' - '46b701b2db7415b30b82023bb707e1dc' - '24da3bee4042e31da5781b02dc089499' - 'b3faadcabfd6d738a41ee4c12696adcd' - '9938f231ce13202d040c24783c95c35b' - '04894f460b81525d29367f1ed1504f5e' - 'c6049613b48eaaa71c45df2e44db1087' - '7e7e81ca9c6d44913d37159b4627967c' - '1a80a20da9cc26e2edd942d77a35c824') +md5sums=('334d06cd9e32b2c3df5129dba4f0f474' + '99954e582ddb9bbd8965e6468e7d9799' + 'a2b777edb9a595b4c427716458ffdeb6' + '2d1796a37f2e927b5939de257dddab4e' + '17589c7d8994d4f62fd95fddc2c0c796' + '27f9d4029dbab73d9f5c6a7c169c1811' + '5d13f0aeb780e4d3693bf62be21e6e11' + 'c47f6aaa0b33261e7277f6d807e88396' + '0d87bb53f0b71634c189eeb3f3d64bc5' + '2ada422bef681cee2bd7e667a9090d6a' + 'fc8bc018c6d41c2fcb883734e37b518a' + '5e9b488cd52a42e235169de3a4b4cea2' + '0b781ce69f571797d3dc1fd5b70d882c' + '5ae943ee2293fd427a0072f1c95dd2e9' + '15d2a2076008efefdb7d031f4d0b1663' + '71a45cefe3b5f45de4ff784ca1a4fe1e' + '98e6f6de8c0184f339cc1b88e31e285b' + '43f9c2a3e9580b6a2adcc36dba4c0755' + 'a12665f7c8e6121e82c6c0be91da3f2a' + '7268181e8190cb62685c365fb99d9102' + '6f60912c53bd21acd99ee11abd5862d9' + '25f2c8a6665f6aef75204b1bcd0c0ff1' + '6e3516383f6eaad4bc1abe5fdd212d26' + 'c76f8a91086735c8252eab0d90e163e6' + '85cf430e36e70713b715fca4e1ac3410' + '60f3573882bbd1dc0ed0f16518660bf9' + '6c51beefb2da7add8c8c635efc2fc565' + 'e2d4d8182716b329249619d227d449f1' + '28facbc470554488b0a722cb0c3d53d3' + '3b167b50c188ef190fbad18077aacc0d' + 'f8edd8921fb8fa24099d1725fc478a2b' + '5b90202d9288d073e5f401b498355c13' + 'ec8478b6e0420484de8d7332bafafac2' + '9d932bc91062a58b0509b5395403c708' + 'bba6d905218c4a2b3d6e289e3ef35186' + 'b32d1ad6e5c8ed52cde0ea351290fd17' + 'd0d1d307c87ec8c8102527944f05887e' + '2605d5226c23205f3c7cd5466059b802' + '2b800c1c729d3b65ae38050bd4c06af1' + '8744ce05e573acefa9f802e53da2aea4' + 'edd3e216b37ee32fd517c2b49e85439a' + 'd9786706c058b1e4acac62f07deac285' + '6377004ddaa6731734696509be6dda53' + 'c73bd01ab8c5a25e234e51082978f7f5' + 'b44a3df07e663803234c72f359d06422' + '81c646a84b4f56d4721bec4013c123bf' + '9b678f5dbb7243b9e5751d04b988b640' + 'c237afb9ed6819a6219383590a8ee448' + 'b27c9236866dd55ee01a6e3929752767' + '8d527119a84f22840a919bc35ed612c0' + '1b51158c8c218544654245c418943c3a' + '1314bbc8cde2babcf6e807f7f958152c' + '59eb9146f16189932d9d5eea536cd8af' + 'a427b45282c6f8f4f1646050e9a93f71' + '618771f03f807603b2efed2760f6004c' + '56ca63d8c797d47fd3b6c094390990d7' + '24bde56465d7ab923fed3e23eca59d42' + 'ff9858a371df54c25f77ea4a5d1091f9' + '6135b885b12ccc64d5c93f385d5c62ad' + 'f98347a6ae9db6faef247373fd5092df' + 'e58f094448b085636c9e9435ef22fb53' + 'ed073cd4a1f3bbdcec1ee56334d8b9d3' + '988a1c279f94941bd4ab3b90cfad0bbe' + 'd8bc3ee80be944051f975a2534651ce1' + 'bd94ef18efe11eeee93a0ff1dc602301' + '20a8381c88b1735c558316936469c1a9' + '064d6f05f7b4c1ce8c5e0f083eccef15' + 'c22c4fb9da7cdee2cb29119e7c4f3696' + '50071d48b92f373713f6f8ee483b6f7d' + '518fbbf3838332da2e561565d29281bf' + '2a5a42ad2110e7e24c967233fdc0dc2c' + 'd21424a551ff625034b6e015f0eddcc4' + '829a1e6fe575e761f97564f68a1859ec' + 'd1047468370b7cbb766ed688107ca879' + '27f3609a99c3be8e59cfc700e251a5d7' + 'c7eb3ef0bedc610065713da9a55e2bf9' + '9125fcb792da1e58f00c43ec5b7bce97' + '5b9dd2a8ac84aace97a6095042ea537b' + '13be748a3331f2a9fac691dec7173aa8' + '0b694233f5385e0e5898d4b64a683bbc' + 'ad037272aabcc3b58fd2141447113905' + '347f53738950c9927b19ec3462840696' + '4fc25f81dd0b744aaaea5705dd36d943' + '5c96e79fc7463907b1c635586c910a71' + '50b1dcbd0eaf9d62b3f9050598298933' + 'c40de39f9502a8789f8301581cad25b4') -- cgit v1.2.3-2-g168b From 2beb195e6425506ec1de35160cb820a73b7b9e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 17 Jun 2012 01:47:15 -0300 Subject: fix icecat-12.0-1 languages --- libre/icecat-i18n/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index 4be40b872..e6f2e82b8 100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD @@ -18,7 +18,7 @@ pkgname=($(for lang in ${_langpacks[@]} done)) _pkgver=12.0 pkgver=12.0 -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for GNUzilla IceCat." arch=('any') license=('MPL') @@ -35,7 +35,7 @@ build() { cd "${srcdir}" } -_path="/usr/lib/icecat-$_pkgver/extensions/" +_path="/usr/lib/icecat/extensions/" for lang in ${_langpacks[@]} do -- cgit v1.2.3-2-g168b From 51326121eaee8da99ca23154ff56f97b0e987cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 17 Jun 2012 13:23:34 -0300 Subject: including lirc-libre and lirc-utils-libre to libre repo --- libre/lirc-libre/PKGBUILD | 112 +++++++++++++++++++++++ libre/lirc-libre/irexec.conf | 5 + libre/lirc-libre/irexecd | 38 ++++++++ libre/lirc-libre/kernel-2.6.39.patch | 54 +++++++++++ libre/lirc-libre/lirc.install | 16 ++++ libre/lirc-libre/lirc.logrotate | 5 + libre/lirc-libre/lirc_atiusb-kfifo.patch | 31 +++++++ libre/lirc-libre/lirc_wpc8769l.patch | 88 ++++++++++++++++++ libre/lirc-libre/lircd | 52 +++++++++++ libre/lirc-libre/lircd-handle-large-config.patch | 39 ++++++++ libre/lirc-libre/lircd.conf | 8 ++ libre/lirc-libre/lircmd | 36 ++++++++ 12 files changed, 484 insertions(+) create mode 100644 libre/lirc-libre/PKGBUILD create mode 100644 libre/lirc-libre/irexec.conf create mode 100644 libre/lirc-libre/irexecd create mode 100644 libre/lirc-libre/kernel-2.6.39.patch create mode 100644 libre/lirc-libre/lirc.install create mode 100644 libre/lirc-libre/lirc.logrotate create mode 100644 libre/lirc-libre/lirc_atiusb-kfifo.patch create mode 100644 libre/lirc-libre/lirc_wpc8769l.patch create mode 100644 libre/lirc-libre/lircd create mode 100644 libre/lirc-libre/lircd-handle-large-config.patch create mode 100644 libre/lirc-libre/lircd.conf create mode 100644 libre/lirc-libre/lircmd (limited to 'libre') diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD new file mode 100644 index 000000000..d6a294fe6 --- /dev/null +++ b/libre/lirc-libre/PKGBUILD @@ -0,0 +1,112 @@ +# $Id$ +# Maintainer: Paul Mattal +# Maintainer (Parabola): André Silva + +_pkgbase=lirc +pkgbase=lirc-libre +pkgname=('lirc-libre' 'lirc-utils-libre') +pkgver=0.9.0 +pkgrel=18 +epoch=1 +_extramodules=extramodules-3.4-LIBRE +arch=('i686' 'x86_64' 'mips64el') +url="http://www.lirc.org/" +license=('GPL') +### NOTICE don't forget to bump version in depends in package_lirc +makedepends=('help2man' 'linux-libre-headers>=3.4' 'linux-libre-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +options=('!makeflags' '!strip') +source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 + lirc_wpc8769l.patch + lircd-handle-large-config.patch + lirc_atiusb-kfifo.patch + kernel-2.6.39.patch + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '3deb02604b37811d41816e9b4385fcc3' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb') + +build() { + _kernver="$(cat /lib/modules/${_extramodules}/version)" + cd "${srcdir}/lirc-${pkgver}" + patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" + patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" + patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" + patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" + + sed -i '/AC_PATH_XTRA/d' configure.ac + sed -e 's/@X_CFLAGS@//g' \ + -e 's/@X_LIBS@//g' \ + -e 's/@X_PRE_LIBS@//g' \ + -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am + libtoolize + autoreconf + + PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ + --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ + --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ + --with-transmitter + + # Remove drivers already in kernel + sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ + -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ + -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ + -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile + make +} + +package_lirc-libre() { + pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock libre kernel" + depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5') + replaces=('lirc' 'lirc+pctv') + conflicts=('lirc') + provides=("lirc=$pkgver") + install=lirc.install + + cd "${srcdir}/lirc-${pkgver}/drivers" + make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install + + # set the kernel we've built for inside the install script + sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" + # gzip -9 modules + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; +} + +package_lirc-utils-libre() { + pkgdesc="Linux-libre Infrared Remote Control utils" + depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') + optdepends=('python2: pronto2lirc utility') + options=('strip' '!libtool') + replaces=('lirc-utils') + conflicts=('lirc-utils') + provides=("lirc-utils=$pkgver") + backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') + + cd "${srcdir}/lirc-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" + cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" + cp -rp remotes "${pkgdir}/usr/share/lirc" + chmod -R go-w "${pkgdir}/usr/share/lirc/" + + # install the logrotate config + install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" + + # install conf.d file + install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" + + # install conf.d file + install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" + + install -d "${pkgdir}/etc/lirc" + + # remove built modules + rm -r "${pkgdir}/lib/" +} diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf new file mode 100644 index 000000000..f911c7515 --- /dev/null +++ b/libre/lirc-libre/irexec.conf @@ -0,0 +1,5 @@ +# +# Parameters for irexec daemon (path to lircrc) +# + +IREXEC_OPTS="" \ No newline at end of file diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd new file mode 100644 index 000000000..a64b033a5 --- /dev/null +++ b/libre/lirc-libre/irexecd @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/irexec.conf + +PID=`pidof -o %PPID /usr/bin/irexec` +case "$1" in + start) + stat_busy "Starting IREXEC Daemon" + [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon irexecd + stat_done + fi + ;; + stop) + stat_busy "Stopping IREXEC Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon irexecd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch new file mode 100644 index 000000000..7353d61ca --- /dev/null +++ b/libre/lirc-libre/kernel-2.6.39.patch @@ -0,0 +1,54 @@ +diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c +--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 +@@ -48,7 +48,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c +--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 +@@ -555,8 +555,8 @@ + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ +diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 +@@ -361,14 +361,14 @@ + size = count << 3; + + ldata = (unsigned long *) data_buf; +- next_one = generic_find_next_le_bit(ldata, size, 0); ++ next_one = find_next_zero_bit_le(ldata, size, 0); + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { +- next_zero = generic_find_next_zero_le_bit(ldata, ++ next_zero = find_next_zero_bit_le(ldata, + size, next_one + 1); + + put_space_bit( +@@ -376,7 +376,7 @@ + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { +- next_one = generic_find_next_le_bit(ldata, ++ next_one = find_next_bit_le(ldata, + size, next_zero + 1); + + put_pulse_bit( diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install new file mode 100644 index 000000000..d6b9e5ff2 --- /dev/null +++ b/libre/lirc-libre/lirc.install @@ -0,0 +1,16 @@ +EXTRAMODULES=extramodules-3.4-LIBRE + +post_install() { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 +} + +post_upgrade() { + post_install +} + +# arg 1: the old package version +post_remove() { + post_install +} diff --git a/libre/lirc-libre/lirc.logrotate b/libre/lirc-libre/lirc.logrotate new file mode 100644 index 000000000..623c4f328 --- /dev/null +++ b/libre/lirc-libre/lirc.logrotate @@ -0,0 +1,5 @@ +/var/log/lircd { + missingok + notifempty + delaycompress +} diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch new file mode 100644 index 000000000..a64984dce --- /dev/null +++ b/libre/lirc-libre/lirc_atiusb-kfifo.patch @@ -0,0 +1,31 @@ +From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 +From: Jason Martin +Date: Fri, 3 Jun 2011 00:12:51 -0400 +Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo + +I came across posts with regards to lirc_atiusb and its compatibility +with newer kernels, and their use of kfifo.I spent a little bit of time +this evening, and was able to correct the issues with the driver, and +now have a functioning lirc_atiusb device under the 2.6.38 kernel. + +Signed-off-by: Jarod Wilson +--- + drivers/lirc_atiusb/lirc_atiusb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +index 52080de..bf2b631 100644 +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) + goto new_irctl_failure_check; + } + +- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { + mem_failure = 4; + goto new_irctl_failure_check; + } +-- +1.7.0.1 + diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch new file mode 100644 index 000000000..e4e2a049b --- /dev/null +++ b/libre/lirc-libre/lirc_wpc8769l.patch @@ -0,0 +1,88 @@ +From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= +Date: Wed, 30 Mar 2011 16:46:35 -0400 +Subject: [PATCH] Make lirc_wpc8769l functional again + +Signed-off-by: Jarod Wilson +--- + drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- + 1 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +index f820d11..4d04063 100644 +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -816,10 +816,6 @@ static int set_use_inc(void *data) + /* Reset last timeout value. */ + lastus = 0; + +- /* Init the read buffer. */ +- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) +- return -ENOMEM; +- + /* Acquire the IRQ. */ + result = request_irq(irq, irq_handler, + IRQF_DISABLED | IRQF_SHARED, +@@ -863,9 +859,6 @@ static void set_use_dec(void *data) + /* Free the IRQ. */ + free_irq(irq, THIS_MODULE); + dprintk("Freed IRQ %d\n", irq); +- +- /* Free the RX buffer. */ +- lirc_buffer_free(&rbuf); + } + + static struct lirc_driver driver = { +@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) + /* Do load-time checks. */ + wpc8769l_power_up_and_check_if_we_woke_us_up(); + ++ /* Init the read buffer. */ ++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { ++ rc = -ENOMEM; ++ goto exit_platform_exit; ++ } ++ + /* Configure the driver hooks. */ + driver.features = LIRC_CAN_REC_MODE2; ++ driver.dev = &lirc_wpc8769l_platform_dev->dev; + driver.minor = lirc_register_driver(&driver); + if (driver.minor < 0) { + eprintk("lirc_register_driver failed!\n"); + rc = -EIO; +- goto exit_platform_exit; ++ goto exit_release_buffer; + } + + iprintk("Driver loaded.\n"); + + return 0; /* Everything OK. */ + ++exit_release_buffer: ++ lirc_buffer_free(&rbuf); ++ + exit_platform_exit: + lirc_wpc8769l_platform_exit(); + +@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); + + static void __exit lirc_wpc8769l_module_exit(void) + { +- /* Unregister the platform driver and device. */ +- lirc_wpc8769l_platform_exit(); +- + /* Unregister the LIRC driver. */ + lirc_unregister_driver(driver.minor); + ++ /* Free the buffer. */ ++ lirc_buffer_free(&rbuf); ++ ++ /* Unregister the platform driver and device. */ ++ lirc_wpc8769l_platform_exit(); ++ + /* Release the second range. */ + if (baseport2) + release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); +-- +1.7.0.1 + diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd new file mode 100644 index 000000000..e9739b36e --- /dev/null +++ b/libre/lirc-libre/lircd @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/lircd.conf + +PID=$(pidof -o %PPID /usr/sbin/lircd) +LIRCD_SYMLINKFILE=/dev/lircd +LIRCD_SOCKET=/var/run/lirc/lircd +case "$1" in + start) + stat_busy "Starting LIRC Daemon" + [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null + rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE + if [ $? -ne 0 ]; then + stat_fail + exit 0 + fi + [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" + [ -z "$PID" ] && + if [ -n "$LIRC_DEVICE" ] ; then + eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE + else + /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE + fi + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lircd + stat_done + fi + ;; + stop) + stat_busy "Stopping LIRC Daemon" + rm -f $LIRCD_SYMLINKFILE + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lircd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 start|stop|restart" +esac +exit 0 diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch new file mode 100644 index 000000000..85bc20518 --- /dev/null +++ b/libre/lirc-libre/lircd-handle-large-config.patch @@ -0,0 +1,39 @@ +From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 +From: Jarod Wilson +Date: Wed, 6 Apr 2011 11:04:12 -0400 +Subject: [PATCH] lircd: handle larger config files in write_socket better + +Pointed out by Michael Zanetti on list, irsend LIST has issues with long +config files, which didn't exist in maintainer mode, as we were using a +do while loop to make sure we spit out everything. Just use that loop +all the time. + +Signed-off-by: Jarod Wilson +--- + daemons/lircd.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/daemons/lircd.c b/daemons/lircd.c +index 6c21a3a..ddcca05 100644 +--- a/daemons/lircd.c ++++ b/daemons/lircd.c +@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) + int done, todo = len; + + while (todo) { +-#ifdef SIM_REC + do { + done = write(fd, buf, todo); +- } +- while (done < 0 && errno == EAGAIN); +-#else +- done = write(fd, buf, todo); +-#endif ++ } while (done < 0 && errno == EAGAIN); ++ + if (done <= 0) + return (done); + buf += done; +-- +1.7.0.1 + diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf new file mode 100644 index 000000000..760dab065 --- /dev/null +++ b/libre/lirc-libre/lircd.conf @@ -0,0 +1,8 @@ +# +# Parameters for lirc daemon +# + +LIRC_DEVICE="/dev/lirc0" +LIRC_DRIVER="" +LIRC_EXTRAOPTS="" +LIRC_CONFIGFILE="" diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd new file mode 100644 index 000000000..220c47c9c --- /dev/null +++ b/libre/lirc-libre/lircmd @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/lircmd` +case "$1" in + start) + stat_busy "Starting lircmd Daemon" + [ -z "$PID" ] && /usr/sbin/lircmd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lircmd + stat_done + fi + ;; + stop) + stat_busy "Stopping lircmd Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lircmd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 -- cgit v1.2.3-2-g168b From 787f513d89a8766f35f513c7426c2288e99d4a0a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 17 Jun 2012 14:05:05 -0400 Subject: Oops, re-remove scroogle (scroogle no longer exists) --- libre/mozilla-searchplugins/PKGBUILD | 3 +-- .../parabola-gnulinux-libre-wiki-en.xml | 9 --------- libre/mozilla-searchplugins/scroogle-ssl-english.xml | 14 -------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml delete mode 100644 libre/mozilla-searchplugins/scroogle-ssl-english.xml (limited to 'libre') diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index b621fbabb..0d1b5b3f1 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -22,7 +22,6 @@ source=( logless-search.xml parabola-packages.xml parabola-wiki-en.xml - scroogle-ssl-english.xml seeks-search.xml wikipedia.xml yacy.xml diff --git a/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml b/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml deleted file mode 100644 index 124f04609..000000000 --- a/libre/mozilla-searchplugins/parabola-gnulinux-libre-wiki-en.xml +++ /dev/null @@ -1,9 +0,0 @@ - -Parabola GNU/Linux-Libre Wiki (en) -Parabola GNU/Linux-Libre Wiki (en) -UTF-8 -https://wiki.parabolagnulinux.org/Special:Search - - - - \ No newline at end of file diff --git a/libre/mozilla-searchplugins/scroogle-ssl-english.xml b/libre/mozilla-searchplugins/scroogle-ssl-english.xml deleted file mode 100644 index f817dce40..000000000 --- a/libre/mozilla-searchplugins/scroogle-ssl-english.xml +++ /dev/null @@ -1,14 +0,0 @@ - -Scroogle SSL English -Scroogle SSL English -UTF-8 -data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA -7 -http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml -http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico -https://ssl.scroogle.org/scrapen8.html - - - - - \ No newline at end of file -- cgit v1.2.3-2-g168b From 1929899e7dccb0e73e82113059a8cf111765beaf Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 17 Jun 2012 14:06:44 -0400 Subject: libre/mozilla-searchplugins: Oops, update md5sums --- libre/mozilla-searchplugins/PKGBUILD | 1 - 1 file changed, 1 deletion(-) (limited to 'libre') diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 0d1b5b3f1..288ce698d 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -38,7 +38,6 @@ md5sums=('e1bda0854de7d764f7401c81bb82b5ef' '937ac0e5392b060d93bd33e761fbfa51' '3c4a7f901bfe9000a702c68f7f78428c' '5bf9ca2558026fa3f4ec52d8e64fee47' - 'cf97082e77e3ef5f1bd74b1db9329965' '86ccb1d02683e69e6bc0543cb77a06bc' 'c35f4971feff8387e0570d7a165eb6fa' '24528ca3f7f1e1a0ba735231aa3ac1de') -- cgit v1.2.3-2-g168b From 9fda2873390c7c61ac51743c71117d0d255991b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 17 Jun 2012 20:25:37 -0300 Subject: grub2-1:2.00beta6-1: updating version --- libre/grub2/PKGBUILD | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'libre') diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index a5051900f..1ef7c3934 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Ronald van Haren # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva _grub_bzr_rev="4232" -_pkgver="2.00~beta4" +_pkgver="2.00~beta6" _grub_lua_ver=24 _grub_gpxe_ver=12 @@ -12,7 +12,7 @@ _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase=grub2 -pkgver=2.00beta4 +pkgver=2.00beta6 pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') @@ -30,15 +30,14 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+' - 'grub-install.fix') + '20_memtest86+') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' +sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb' '89290031b974780c6df76893836d2477d4add895' 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' @@ -46,8 +45,8 @@ sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' '31aa740fc225b3f3ed4917843038f9e8658a71be' '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' '9735043d518e16f147f64ef283eceb2549fed860' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' - '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7') + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') + _build_grub2-common_and_bios() { ## copy the source for building the common/bios package @@ -58,10 +57,6 @@ _build_grub2-common_and_bios() { patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo - ## upstream grub-install fix - ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html - patch -Np0 -i "${srcdir}/grub-install.fix" - ## add the grub-extra sources export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/" install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -204,7 +199,7 @@ package_grub2-common() { options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') cd "${srcdir}/grub_bios-${_pkgver}" - make DESTDIR="${pkgdir}/" install + make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install ## install extra /etc/grub.d/ files install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" -- cgit v1.2.3-2-g168b From a2c462658b5b7673d86fe195fc6537b1b9cf9fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 18 Jun 2012 16:48:58 -0300 Subject: linux-libre-3.4.3-1: updating version --- libre/linux-libre/3.4.2-rpc_pipefs.patch | 1 - libre/linux-libre/PKGBUILD | 10 +++++----- libre/linux-libre/linux-libre.install | 5 ++++- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch index 5c3245669..db53b3813 100644 --- a/libre/linux-libre/3.4.2-rpc_pipefs.patch +++ b/libre/linux-libre/3.4.2-rpc_pipefs.patch @@ -31,4 +31,3 @@ index 0404047..21fde99 100644 -- 1.7.7.6 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7ff0def9e..3c9b2a8cc 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds # Maintainer (Parabola): Sorin-Mihai Vârgolici -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva # Maintainer (Parabola): Michał Masłowski # Contributor (Parabola): Márcio Silva @@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.4.2-rpc_pipefs.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - 'ea827952923c8a926c0831ad3f124190' + '0187759260fd998fc2130e069df5b054' '669c3f9d5c6a2109bad8e511287826c3' '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -44,7 +44,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '0851216ee7ac3aad76438bb937314fd1' + '5a7baeab35f968bf9a6ab115d14586c7' '972b3b460764780ee48f031a043a9c09') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 2f2944e2b..b70fd9663 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,10 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.2-2-LIBRE +KERNEL_VERSION=3.4.3-1-LIBRE + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' post_install () { # updating module dependencies -- cgit v1.2.3-2-g168b From 995b50d53e475bccdea382da870e37f87a5bfb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 18 Jun 2012 23:22:49 -0300 Subject: linux-libre-lts-3.0.35-1: updating version --- libre/linux-libre-lts/PKGBUILD | 6 +++--- libre/linux-libre-lts/linux-libre-lts.install | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f8c0edc6a..9c2909331 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva # Contributor (Parabola): Márcio Silva pkgbase=linux-libre-lts @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=34 +_sublevel=35 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver pkgrel=1 @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '627ea698f9e8613f5d239ac2e6622c4e' + '7104adc7c0c6ab88820fce6d34ac595c' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index ba3511bcf..b3426d278 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,10 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.34-1-LIBRE-LTS +KERNEL_VERSION=3.0.35-1-LIBRE-LTS + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' post_install () { # updating module dependencies -- cgit v1.2.3-2-g168b From de2295f3705c7e25e884e81ef5426c913ba20005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 19 Jun 2012 15:49:22 -0300 Subject: filesystem-2012.6-3: updating version --- libre/filesystem/PKGBUILD | 44 ++++++++++++++++++------------------- libre/filesystem/filesystem.install | 3 ++- libre/filesystem/group | 1 + 3 files changed, 25 insertions(+), 23 deletions(-) (limited to 'libre') diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 3443dacb4..bc59eabdc 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160797 2012-06-06 10:14:15Z dreisner $ +# $Id: PKGBUILD 162078 2012-06-19 14:17:35Z tomegun $ # Maintainer: Tom Gundersen -# Maintainer (Parabola): fauno -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Nicolás Reynolds +# Maintainer (Parabola): André Silva pkgname=filesystem pkgver=2012.6 -pkgrel=2 +pkgrel=3 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -19,24 +19,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') -md5sums=('772fe869b921698cc3e6fde73c4ac85a' - '6be47d893fd49b2e4a8c0e811b350861' - '13753e4e0964f3652b0cc60a28528bdf' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - 'ca716f853860199c1286e7939b2f2666' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'd2dc4e39dbdea75b107f91789e3274ab' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130') package() { cd ${pkgdir} @@ -96,3 +78,21 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('45940618da782cc391c59f88ab3333c3' + '6be47d893fd49b2e4a8c0e811b350861' + '13753e4e0964f3652b0cc60a28528bdf' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '8a9042a2cedf6b6b47eb8973f14289cb' + 'b8355d9d2782f424f4cedcf682651be0' + 'ca716f853860199c1286e7939b2f2666' + 'e5d8323a4dbee7a6d0d2a19cbf4b819f' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'd2dc4e39dbdea75b107f91789e3274ab' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + 'a8a962370cd0128465d514e6a1f74130') diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index f880b6496..c8717f01b 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -40,9 +40,10 @@ post_upgrade() { _adduser http -u 33 -d /srv/http -g http -s /bin/false _addgroup scanner -g 96 _addgroup rfkill -g 24 + _addgroup lock -g 54 # sync gshadow to group (fixes FS#19869 - if ! grep -q '^rfkill:' etc/gshadow; then + if ! grep -q '^lock:' etc/gshadow; then grpconv >/dev/null fi diff --git a/libre/filesystem/group b/libre/filesystem/group index 261746d9e..6e8e773d8 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -19,6 +19,7 @@ rfkill:x:24: smmsp:x:25: http:x:33: games:x:50: +lock:x:54: network:x:90: video:x:91: audio:x:92: -- cgit v1.2.3-2-g168b From 284e095fe026fa0846d48105c7f9b2238d57ee3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 19 Jun 2012 16:44:07 -0300 Subject: kdelibs-libre: updating pkgrel due attica dependencies --- libre/kdelibs-libre/PKGBUILD | 10 +++-- libre/kdelibs-libre/fix-application-crashes.patch | 49 +++++++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 libre/kdelibs-libre/fix-application-crashes.patch (limited to 'libre') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0ddf606ec..fed954896 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160936 2012-06-07 06:38:07Z andrea $ +# $Id: PKGBUILD 162049 2012-06-19 08:17:58Z andrea $ # Maintainer: Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.4 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -24,10 +24,12 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' + 'fix-application-crashes.patch' 'khtml-fsdg.diff') sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' + 'c271c712bf202f517015b597d61cfe1aed0db82b' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -39,6 +41,8 @@ build() { # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch + # KDEBUG 301453 + patch -p1 -i "${srcdir}"/fix-application-crashes.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/fix-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch new file mode 100644 index 000000000..8ac385483 --- /dev/null +++ b/libre/kdelibs-libre/fix-application-crashes.patch @@ -0,0 +1,49 @@ +From: Vishesh Handa +Date: Wed, 13 Jun 2012 21:26:31 +0000 +Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d +--- +Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" + +This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. + +This is done so that 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -94,7 +94,7 @@ public: + + // we may get disconnected from the server but we don't want to try + // to connect every time the model is requested +- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { ++ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { + delete localSocketModel; + localSocketModel = 0; + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + +From: Vishesh Handa +Date: Wed, 13 Jun 2012 21:25:32 +0000 +Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us." +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=76e0376d7582cfe5b898c56bf3779ca2279dace8 +--- +Revert "Disconnect before re-connecting. Soprano does not do that for us." + +This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. + +This is being done so that KDE 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -97,7 +97,6 @@ public: + if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { + delete localSocketModel; + localSocketModel = 0; +- localSocketClient.disconnect(); + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + kDebug() << "Connecting to local socket" << socketName; + if ( localSocketClient.connect( socketName ) ) { + -- cgit v1.2.3-2-g168b From 548d9fd6d7de6c1acc52c33b2f41f7cf93fa6ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 20 Jun 2012 16:30:41 -0300 Subject: filesystem-2012.6-4: updating release due entry lock is missing in gshadow. This will break a fresh install --- libre/filesystem/PKGBUILD | 6 +++--- libre/filesystem/gshadow | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index bc59eabdc..215001c4e 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162078 2012-06-19 14:17:35Z tomegun $ +# $Id: PKGBUILD 162111 2012-06-20 09:33:31Z tomegun $ # Maintainer: Tom Gundersen # Maintainer (Parabola): Nicolás Reynolds # Maintainer (Parabola): André Silva pkgname=filesystem pkgver=2012.6 -pkgrel=3 +pkgrel=4 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -93,6 +93,6 @@ md5sums=('45940618da782cc391c59f88ab3333c3' '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - 'd2dc4e39dbdea75b107f91789e3274ab' + 'f95416882cef800edef08382a1176b7d' 'f3b6ae7db8adffaaa4bffc6099dcbd50' 'a8a962370cd0128465d514e6a1f74130') diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index ed176823e..c5c76354e 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -19,6 +19,7 @@ rfkill:x:: smmsp::: http::: games::: +lock::: network:x:: video:x:: audio::: -- cgit v1.2.3-2-g168b From 02201d5cde5e37ad9137e6648cce39e253afaae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 21 Jun 2012 18:58:54 -0300 Subject: virtualbox-libre-4.1.18-1: updating version --- libre/virtualbox-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 402d1c7fd..e4326a2e1 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Nicolas Reynolds # Maintainer (Parabola): Jorge López -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva # Changes: # * Adapt to linux-libre # * virtualbox-{archlinux,parabola}-* @@ -11,7 +11,7 @@ #Maintainer: Ionut Biru pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.16 +pkgver=4.1.18 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -194,7 +194,7 @@ package_virtualbox-parabola-additions(){ # install sample config install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service" } -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '5f85710e0b8606de967716ded7b2d351' '755ab0dd9bcacf2c00d2275b1ca69547' 'a1ff1d1b4423556887e48a32978226a6' -- cgit v1.2.3-2-g168b From 278d306392964e5b676f3baae40d9a91a3e7dc47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 21 Jun 2012 18:59:17 -0300 Subject: virtualbox-modules-4.1.18-1: updating version --- libre/virtualbox-modules/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index e14bf347c..2e747105a 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ #Maintainer: Ionut Biru #Maintainer (Parabola): Jorge López -#Contributor (Parabola): André Silva +#Contributor (Parabola): André Silva pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.16 -pkgrel=2 +pkgver=4.1.18 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -14,7 +14,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') -- cgit v1.2.3-2-g168b From 52d15999a6a4e73dffde1c49b31bb080ebb06030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 21 Jun 2012 18:59:40 -0300 Subject: virtualbox-modules-lts-4.1.18-1: updating version --- libre/virtualbox-modules-lts/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD index 8ff59d712..d3b44d748 100644 --- a/libre/virtualbox-modules-lts/PKGBUILD +++ b/libre/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Bartłomiej Piotrowski # Maintainer (Parabola): Márcio Silva -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva # Maintainer (Parabola): Jorge López pkgbase=virtualbox-modules-lts pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts') -pkgver=4.1.14 +pkgver=4.1.18 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -15,7 +15,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') -- cgit v1.2.3-2-g168b From caf7fef3d8e531ba473cb4cc33bb060a96935b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 21 Jun 2012 19:27:39 -0300 Subject: hplip-libre-3.12.6-1: updating version --- libre/hplip-libre/PKGBUILD | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'libre') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index c2cec2e13..b6bc8ce2f 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -2,19 +2,19 @@ # Maintainer: Tom Gundersen # Maintainer : Rémy Oudompheng # Contributor: Morgan LEFIEUX -# Contributor (Parabola): Jorge López +# Maintainer (Parabola): Jorge López _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.4 -pkgrel=4 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +pkgver=3.12.6 +pkgrel=1 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -22,40 +22,41 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-pyqt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox') -replaces=('hpijs' "${_pkgname}") + 'python2-gobject2: for running hp-toolbox' + 'libusbx: for advanced usb support') +replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('a063f76aa47edab55a3f31ff2558df07' - '2fe18f4091afb3dec200271dc7836128') +md5sums=('5303938e8630775ea6fb383af85775e5' + 'b562457e4c713d8609b3d6dd2be10baf') build() { cd "$srcdir/$_pkgname-$pkgver" export PYTHON=python2 - + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + export AUTOMAKE='automake --foreign' autoreconf --force --install @@ -70,7 +71,7 @@ build() { --enable-hpijs-install \ --enable-foomatic-drv-install \ --enable-pp-build \ - --enable-udev-acl-rules + --enable-udev-acl-rules #--help make } -- cgit v1.2.3-2-g168b From b3ec07fa8c28f0f1d99a9e092e042be81c219972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 22 Jun 2012 17:26:40 -0300 Subject: python-reportlab-libre-2.5-2: updating pkgrel --- libre/python-reportlab-libre/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index e0dfc9d9c..fd1326462 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -3,11 +3,12 @@ # Contributor: William Rea # Maintainer (Parabola): fauno # Contributor: borgo +# Contributor (Parabola): André Silva pkgname=python-reportlab-libre _origname=reportlab pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A proven industry-strength PDF generating solution" arch=('i686' 'x86_64') depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') @@ -34,6 +35,6 @@ build() { rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt patch -p1 -i $srcdir/free-fonts.patch - python2 setup.py install --root=$pkgdir + python2 setup.py install --root=$pkgdir --optimize=1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt } -- cgit v1.2.3-2-g168b From 9b4e8c53957e11fb5ad3d4d906e66bd67ffc0ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 22 Jun 2012 17:32:11 -0300 Subject: python-reportlab-libre-2.5-2: fixing URL --- libre/python-reportlab-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index fd1326462..122d74bf2 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgdesc="A proven industry-strength PDF generating solution" arch=('i686' 'x86_64') depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') license=('custom') -source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz +source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz free-fonts.patch) url="http://www.reportlab.org/rl_toolkit.html" md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3' -- cgit v1.2.3-2-g168b From 0369ecac748997ad9b4b6694afe0b65137410b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 23 Jun 2012 15:34:44 -0300 Subject: linux-libre: updating 3.4.4 version for i686 and x86_64 and updating 3.4.3 version for mips64el --- libre/linux-libre/PKGBUILD | 10 +++------- libre/linux-libre/linux-libre.install | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3c9b2a8cc..7b228cef3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver pkgrel=1 @@ -32,10 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - '3.4.2-rpc_pipefs.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '0187759260fd998fc2130e069df5b054' + 'e9bb311ab329555a61696b1a18df2d34' '669c3f9d5c6a2109bad8e511287826c3' '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -44,8 +43,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '5a7baeab35f968bf9a6ab115d14586c7' - '972b3b460764780ee48f031a043a9c09') + 'f959f197166bf56c19fc09e79a1bf1d3') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -62,8 +60,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix nfs4 regression - patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index b70fd9663..ba766d0c7 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.3-1-LIBRE +KERNEL_VERSION=3.4.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From 79c0430f9d9453cfae107700fe6fc72db1b2e42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 23 Jun 2012 15:40:05 -0300 Subject: removing obsolete patch --- libre/linux-libre/3.4.2-rpc_pipefs.patch | 33 -------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 libre/linux-libre/3.4.2-rpc_pipefs.patch (limited to 'libre') diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch deleted file mode 100644 index db53b3813..000000000 --- a/libre/linux-libre/3.4.2-rpc_pipefs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 0404047..21fde99 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head, - msg->errno = err; - destroy_msg(msg); - } while (!list_empty(head)); -- wake_up(waitq); -+ -+ if (waitq) -+ wake_up(waitq); - } - - static void -@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work) - } - dentry = dget(pipe->dentry); - spin_unlock(&pipe->lock); -- if (dentry) { -- rpc_purge_list(&RPC_I(dentry->d_inode)->waitq, -- &free_list, destroy_msg, -ETIMEDOUT); -- dput(dentry); -- } -+ rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL, -+ &free_list, destroy_msg, -ETIMEDOUT); -+ dput(dentry); - } - - ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg, --- -1.7.7.6 - -- cgit v1.2.3-2-g168b From a38e546048bfb1a061a9be6ed707d39c770d9f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 24 Jun 2012 13:10:44 -0300 Subject: linux-libre-3.4.4-1: updating version for mips64el --- libre/linux-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7b228cef3..71a548e0a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,7 +14,7 @@ _kernelname=-LIBRE _basekernel=3.4 _sublevel=4 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -43,7 +43,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - 'f959f197166bf56c19fc09e79a1bf1d3') + '86910efeadb5d1e5d5416ff1a9dacb33') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-2-g168b From e4392d9d9359136fe446862756fe3735c58f0364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 24 Jun 2012 13:11:17 -0300 Subject: linux-libre-lts-3.0.36-1: updating version --- libre/linux-libre-lts/PKGBUILD | 6 +++--- libre/linux-libre-lts/linux-libre-lts.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 9c2909331..257e3460d 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=35 +_sublevel=36 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver pkgrel=1 @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '7104adc7c0c6ab88820fce6d34ac595c' + '150413437fe54d4822e9e43189e37319' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '1a107ca509aec77af60fe8e9612c9fae') + '7102cdd847f0bd7102f0ad01fa43f454') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b3426d278..4b6841658 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.35-1-LIBRE-LTS +KERNEL_VERSION=3.0.36-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From b071c6284cd3f06a0be7471652e22e87c86cea11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 24 Jun 2012 13:13:22 -0300 Subject: linux-libre-lts-3.0.36-1: fixing version for mips64el --- libre/linux-libre-lts/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 257e3460d..6c163e5f5 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -11,7 +11,7 @@ _kernelname=-LIBRE-LTS _basekernel=3.0 _sublevel=36 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.34 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" -- cgit v1.2.3-2-g168b From 3732ba8acc6cc8459df842ba839017a9041d65a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 25 Jun 2012 02:20:35 -0300 Subject: linux-libre-3.4.4-2: adding new patchs and updating revision --- .../3.4.4-fix-backlight-regression.patch | 38 ++++++++++++++++++++++ .../3.4.4-fix-gtx560ti-nouveau-regression.patch | 20 ++++++++++++ libre/linux-libre/ChangeLog | 13 +++++--- libre/linux-libre/PKGBUILD | 20 ++++++++++-- libre/linux-libre/linux-libre.install | 2 +- 5 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 libre/linux-libre/3.4.4-fix-backlight-regression.patch create mode 100644 libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch (limited to 'libre') diff --git a/libre/linux-libre/3.4.4-fix-backlight-regression.patch b/libre/linux-libre/3.4.4-fix-backlight-regression.patch new file mode 100644 index 000000000..a0cf0b1db --- /dev/null +++ b/libre/linux-libre/3.4.4-fix-backlight-regression.patch @@ -0,0 +1,38 @@ +Subject: Still use ACPI backlight control if _DOS doesn't exist + +This is a regression introduced by commit +ea9f8856bd6d4ed45885b06a338f7362cd6c60e5 + +https://bugzilla.kernel.org/show_bug.cgi?id=43168 + +Some platforms don't have _DOS control method, but the ACPI +backlight still works. +We do not want to lose the backlight control ability on these platforms. + +CC : Igor Murzov +Signed-off-by: Zhang Rui +--- + drivers/acpi/video.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +Index: rtd3/drivers/acpi/video.c +=================================================================== +--- rtd3.orig/drivers/acpi/video.c ++++ rtd3/drivers/acpi/video.c +@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus + video->dos_setting = arg0.integer.value; + status = acpi_evaluate_object(video->device->handle, "_DOS", + &args, NULL); +- if (ACPI_FAILURE(status)) +- return -EIO; ++ if (ACPI_FAILURE(status)) { ++ /* ++ * some platforms don't have _DOS, but the ACPI ++ * backlight control still works ++ */ ++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n")); ++ return 0; ++ } + + return 0; + } diff --git a/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch b/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch new file mode 100644 index 000000000..1b70e918c --- /dev/null +++ b/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch @@ -0,0 +1,20 @@ +Revert change to include/drm/drm_fb_helper.h made in commit 4f988d132d2668b4f3b42bfc70daa531115ccca1 + + include/drm/drm_fb_helper.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h +index 55e10d6..5120b01 100644 +--- a/include/drm/drm_fb_helper.h ++++ b/include/drm/drm_fb_helper.h +@@ -35,6 +35,7 @@ struct drm_fb_helper; + #include + + struct drm_fb_helper_crtc { ++ uint32_t crtc_id; + struct drm_mode_set mode_set; + struct drm_display_mode *desired_mode; + }; +-- +1.7.6.5 + diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index a6f62e2cd..b41198fe5 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,19 +1,24 @@ -2012-05-26 André Silva +2012-06-23 André Silva + + * linux-libre-3.4.4-1 + * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com. + +2012-05-26 André Silva * linux-libre-3.4-1.2 * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116 -2012-04-24 André Silva +2012-04-24 André Silva * linux-libre-3.3.3-1 * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 -2012-04-08 André Silva +2012-04-08 André Silva * linux-libre-3.3.1-1.1 * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 -2012-03-03 André Silva +2012-03-03 André Silva * linux-libre-2.3.9-2 * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 71a548e0a..3ff5e5681 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Sorin-Mihai Vârgolici # Maintainer (Parabola): André Silva # Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel @@ -15,7 +15,7 @@ _basekernel=3.4 _sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,6 +32,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' + '3.4.4-fix-backlight-regression.patch' + '3.4.4-fix-gtx560ti-nouveau-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' 'e9bb311ab329555a61696b1a18df2d34' @@ -43,6 +45,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '827ffd855dc8b0c91577545c5804c19f' '86910efeadb5d1e5d5416ff1a9dacb33') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -72,7 +76,19 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + # Fix backlight control on some laptops: + # https://bugzilla.kernel.org/show_bug.cgi?id=43168 + patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch" + + # fix nouveau regression + # Arch Linux bug report: FS#30417 + patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch" + # Patch submitted upstream, waiting for inclusion: + # https://lkml.org/lkml/2012/2/19/51 + # add support for latest bios of Acer 1810T acerhdf module + patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index ba766d0c7..5e87c939e 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.4-1-LIBRE +KERNEL_VERSION=3.4.4-2-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' -- cgit v1.2.3-2-g168b From 3c1b9f0a9d03c0798eb272525e96551713cdf613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 25 Jun 2012 02:28:55 -0300 Subject: grub2 1:2.00rc1-1: updating version --- libre/grub2/PKGBUILD | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'libre') diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index 1ef7c3934..936a5d41f 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -2,17 +2,15 @@ # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -_grub_bzr_rev="4232" -_pkgver="2.00~beta6" +_pkgver="2.00~rc1" _grub_lua_ver=24 -_grub_gpxe_ver=12 _grub_ntldr_ver=21 _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase=grub2 -pkgver=2.00beta6 +pkgver=2.00rc1 pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') @@ -24,7 +22,6 @@ makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo' # source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz" source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" 'parabola_grub_mkconfig_fixes.patch' @@ -33,13 +30,11 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz '20_memtest86+') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb' +sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13' '89290031b974780c6df76893836d2477d4add895' - 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' '31aa740fc225b3f3ed4917843038f9e8658a71be' @@ -64,9 +59,6 @@ _build_grub2-common_and_bios() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -125,9 +117,6 @@ _build_grub2-efi-i386() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ - -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - ## Requires python2 # sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh" -- cgit v1.2.3-2-g168b From f390bdd170ecc44f42aabb0fd034c2f9368c2fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 25 Jun 2012 18:19:38 -0300 Subject: linux-libre-3.4.4-2: fixing issues on patch --- libre/linux-libre/PKGBUILD | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3ff5e5681..f4fa860e8 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -84,11 +84,6 @@ build() { # Arch Linux bug report: FS#30417 patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch" - # Patch submitted upstream, waiting for inclusion: - # https://lkml.org/lkml/2012/2/19/51 - # add support for latest bios of Acer 1810T acerhdf module - patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) -- cgit v1.2.3-2-g168b From 54cec3f05fae381e28b14adc5f6dc1d2ae5350f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 26 Jun 2012 17:32:01 -0300 Subject: foomatic-filters-libre-1:4.0.16_20120626-1: updating version --- libre/foomatic-filters-libre/PKGBUILD | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'libre') diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 1149a2558..87b155c0c 100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 155770 2012-04-06 10:08:29Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgbase="foomatic" pkgname=('foomatic-filters-libre') arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120406 -_filtersver=4.0.15 +_snapdate=20120626 +_filtersver=4.0.16 pkgver=${_filtersver}_${_snapdate} -pkgrel=1.2 +pkgrel=1 epoch=1 makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') -#_url=http://www.openprinting.org/download/foomatic/ # switch after build -_url=ftp://ftp.archlinux.org/other/foomatic/ -source=(${_url}/$pkgbase-filters-${_filtersver}.tar.gz) +source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz) url="http://www.linuxprinting.org/foomatic.html" options=('!emptydirs') -md5sums=('1b7efcdc57340915647daa5b5c15b0ef') +md5sums=('ec907d9ea17e03bccb91db66e9470586') package_foomatic-filters-libre() { -- cgit v1.2.3-2-g168b From 959dc6e01ae79f26cf820ee49d2c7a360ac2b8d4 Mon Sep 17 00:00:00 2001 From: Jorginho Date: Wed, 27 Jun 2012 02:32:40 +0200 Subject: remove cups-filters-libre --- libre/cups-filters-libre/PKGBUILD | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 libre/cups-filters-libre/PKGBUILD (limited to 'libre') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD deleted file mode 100644 index 09db17876..000000000 --- a/libre/cups-filters-libre/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke - -pkgname=cups-filters-libre -_pkgname=cups-filters -pkgver=1.0.18 -pkgrel=2.1 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -depends=('lcms2' 'poppler') -makedepends=('ghostscript') -optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' - 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') -backup=(etc/fonts/conf.d/99pdftoopvp.conf) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=(63972b426b7224915cdbb42b2a937374'') - -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") - -build() { - cd "$srcdir/$_pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - #make DESTDIR="$pkgdir/" install - make install BUILDROOT="$pkgdir/" - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a -} -- cgit v1.2.3-2-g168b From a91d07e88df95b66eee460d42e6bbbbbcd011374 Mon Sep 17 00:00:00 2001 From: Jorginho Date: Wed, 27 Jun 2012 02:33:29 +0200 Subject: updating cups-filters-libre --- libre/cups-filters-libre/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 libre/cups-filters-libre/PKGBUILD (limited to 'libre') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD new file mode 100644 index 000000000..662ed4d1a --- /dev/null +++ b/libre/cups-filters-libre/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Andreas Radke + +pkgname=cups-filters-libre +_pkgname=cups-filters +pkgver=1.0.18 +pkgrel=3 +pkgdesc="OpenPrinting CUPS Filters" +arch=('i686' 'x86_64') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +depends=('lcms2' 'poppler>=0.20.1') +makedepends=('ghostscript') +optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') +backup=(etc/fonts/conf.d/99pdftoopvp.conf) +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) +md5sums=(63972b426b7224915cdbb42b2a937374'') + +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + #make DESTDIR="$pkgdir/" install + make install BUILDROOT="$pkgdir/" + # drop static lib + rm -f ${pkgdir}/usr/lib/*.a +} -- cgit v1.2.3-2-g168b From 301eee81b736278d4c83fc3a5bb2fdf14e3d5801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 26 Jun 2012 22:56:19 -0300 Subject: texlive-bin-libre-2012.0-1: updating version --- libre/texlive-bin-libre/PKGBUILD | 126 ++++++++++------------------- libre/texlive-bin-libre/poppler-0.20.patch | 22 +++++ 2 files changed, 64 insertions(+), 84 deletions(-) create mode 100644 libre/texlive-bin-libre/poppler-0.20.patch (limited to 'libre') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 31b440c9d..68c71284c 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 159191 2012-05-17 14:36:30Z remy $ +# $Id: PKGBUILD 162397 2012-06-26 20:13:46Z remy $ # Maintainer: Rémy Oudompheng # Contributor: francois # Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=texlive-bin-libre -pkgver=2011.3 -_luatex_ver=0.70.1 -pkgrel=7 +pkgver=2012.0 +pkgrel=1 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') @@ -23,11 +22,9 @@ install="texlive.install" source=('texmf.cnf' 'fix-fontforge-encoding.patch' '09-texlive-fonts.conf' - 'luatex-poppler-0.20.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111210.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111210.tar.xz' - # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" - 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' + 'poppler-0.20.patch' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ @@ -46,10 +43,9 @@ backup=(etc/texmf/web2c/texmf.cnf \ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' 'bfb9716aa00c86c08cd31e5b32edeb98' '393a4bf67adc7ca5df2b386759d1a637' - '52ce57c02e30a25036b6a3175c566b78' - 'c7bb38c0ab30c2b64cf4cf83a736b35c' - '5d8f06a3683ce88a3c33e15f5ba6a858' - 'e7f0197559ef865d8c01683dab3b8526') + 'e3a664d5a7f0923f35060fe9d25d2573' + 'ac2c3c3aa765581f8504e21a5edbfb9f' + 'f315a860158cfc952c82a6d759961024') build() { if [ "${CARCH}" != "i686" ]; then @@ -57,50 +53,11 @@ build() { export CXXFLAGS="${CXXFLAGS} -fPIC" fi - cd "$srcdir" - # Building LuaTeX - # cd luatex-beta-${_luatex_ver} - cd luatex - patch -p0 -i ../fix-fontforge-encoding.patch - patch -Np0 -i ../luatex-poppler-0.20.patch - (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh) - mkdir build - cd build - ../source/configure --prefix=/usr -C \ - --disable-native-texlive-build \ - --with-banner-add="/Parabola GNU/Linux-libre" \ - --enable-cxx-runtime-hack \ - --disable-all-pkgs \ - --disable-dump-share \ - --disable-ptex \ - --enable-luatex \ - --without-system-ptexenc \ - --without-system-graphite \ - --without-system-icu \ - --without-system-kpathsea \ - --with-system-freetype2 \ - --with-system-poppler \ - --with-freetype2-libdir=/usr/lib \ - --with-freetype2-include=/usr/include/freetype2 \ - --with-system-gd \ - --with-system-libpng \ - --without-system-teckit \ - --with-system-zlib \ - --with-system-zziplib \ - --with-system-t1lib \ - --disable-shared \ - --disable-largefile \ - --disable-ipc \ - --without-mf-x-toolkit \ - --without-x - make - make -C libs/obsdcompat - make -C texk/kpathsea - make -C texk/web2c luatex - - cd "$srcdir" + cd "$srcdir" # this patch removes spurious error message with locale "xx_YY.utf8" - patch -p0 -i fix-fontforge-encoding.patch + patch -Np0 -i fix-fontforge-encoding.patch + # fix build with poppler >= 0.20 + patch -Np0 -i poppler-0.20.patch # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c ############################################################# @@ -127,22 +84,22 @@ build() { --disable-t1utils \ --disable-bibtexu \ --disable-xz \ - --without-system-zlib \ - --without-system-zziplib \ - --without-system-pnglib \ + --with-system-zlib \ + --with-system-zziplib \ + --with-system-pnglib \ --with-system-ncurses \ --with-system-t1lib \ - --without-system-gd \ - --without-system-poppler \ - --without-system-xpdf \ - --without-system-freetype2 \ + --with-system-gd \ + --with-system-poppler \ + --with-system-xpdf \ + --with-system-freetype2 \ --without-system-graphite \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ --with-xdvi-x-toolkit=xaw \ --disable-dump-share \ --disable-aleph \ - --disable-luatex \ + --enable-luatex \ --with-clisp-runtime=default \ --enable-xindy --disable-xindy-rules --disable-xindy-docs ############################################################# @@ -238,13 +195,6 @@ package() { ## remove aleph from fmtutil.cnf sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf - ## install luatex binary - #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/ - install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/ - cd "$pkgdir"/usr/bin - /bin/ln -s luatex texlua - /bin/ln -s luatex texluac - ## install Perl libraries mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive @@ -256,6 +206,7 @@ package() { # remove dangling symlinks _bibtexextra_scripts=" bibexport +listbib urlbst " _core_scripts=" @@ -263,6 +214,7 @@ afm2afm arlatex autoinst bundledoc +checkcites cmap2enc ctanify ctanupload @@ -277,6 +229,7 @@ installfont-tl latex2man latexdiff latexdiff-vc +latexfileversion latexmk latexrevise listings-ext.sh @@ -315,31 +268,36 @@ texdiff texdirflatten texliveonfly texloganalyser +typeoutfileinfo thumbpdf vpl2ovp vpl2vpl " _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" + _langcjk_scripts="convbkmk updmap-setup-kanji" _langextra_scripts="ebong" _langgreek_scripts="mkgrkindex" - _latexextra_scripts="authorindex \ -makeglossaries \ -pdfannotextractor \ -pdfthumb \ -perltex \ -ppower4 \ -ps4pdf \ -splitindex \ -svn-multi \ + _latexextra_scripts=" +authorindex +exceltex +exceltex +makeglossaries +pdfannotextractor +perltex +ppower4 +ps4pdf +splitindex +svn-multi vpe" - _music_scripts="musixtex musixflx" + _music_scripts="m-tx musixtex musixflx pmx2pdf" _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic" - _pstricks_scripts="pst2pdf" + _pstricks_scripts="pedigree pst2pdf" _science_scripts="ulqda" for s in \ ${_bibtexextra_scripts} \ ${_core_scripts} \ ${_htmlxml_scripts} \ + ${_langcjk_scripts} \ ${_langextra_scripts} \ ${_langgreek_scripts} \ ${_latexextra_scripts} \ diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch new file mode 100644 index 000000000..3bd8183ab --- /dev/null +++ b/libre/texlive-bin-libre/poppler-0.20.patch @@ -0,0 +1,22 @@ +--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000 ++++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000 +@@ -1433,7 +1433,7 @@ + + static int m_Object_getTypeName(lua_State * L) + { +- char *s; ++ const char *s; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) +--- source/texk/web2c/pdftexdir/pdftosrc.cc.orig 2012-06-24 17:12:34.376329435 +0200 ++++ source/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-24 17:12:25.490003152 +0200 +@@ -134,7 +134,7 @@ + exit(1); + } + if (extract_xref_table) { +- int size = xref->getSize(); ++ int size = xref->getNumObjects(); + int i; + for (i = 0; i < size; i++) { + if (xref->getEntry(i)->offset == 0xffffffff) -- cgit v1.2.3-2-g168b From 4760b0bd72014d74051ce51beb7bf7a92f54667a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 26 Jun 2012 22:59:44 -0300 Subject: texlive-core-libre-2012.26892-1: updating version --- libre/texlive-core-libre/.directory | 5 +++ libre/texlive-core-libre/PKGBUILD | 60 +++++++++++++----------------- libre/texlive-core-libre/texlive-core.maps | 6 +++ libre/texlive-core-libre/texlive.install | 8 ++-- 4 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 libre/texlive-core-libre/.directory (limited to 'libre') diff --git a/libre/texlive-core-libre/.directory b/libre/texlive-core-libre/.directory new file mode 100644 index 000000000..9d572f361 --- /dev/null +++ b/libre/texlive-core-libre/.directory @@ -0,0 +1,5 @@ +[Dolphin] +Timestamp=2012,6,26,20,37,17 + +[Settings] +HiddenFilesShown=true diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index eb120c0ad..ad5f4e365 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -1,11 +1,12 @@ -# Parabola maintainer: Michał Masłowski # Maintainer: Rémy Oudompheng +# Maintainer (Parabola): Michał Masłowski +# Contributor (Parabola): André Silva pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2011.24722 -_revnr=${pkgver#2011.} -pkgrel=1.1 +pkgver=2012.26892 +_revnr=${pkgver#2012.} +pkgrel=1 pkgdesc="TeX Live core distribution" license=('GPL') arch=(any) @@ -24,35 +25,27 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core') provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver") replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "${_pkgname}.maps") options=(!strip) install=texlive.install #backup=(etc/texmf/tex/context/config/cont-usr.tex) -md5sums=('3cf22c52c9b2719d23ad1479e0ae3b3a' - '490872c9981c40d20721de1e2fccccb8') - -mksource() { - [ -f texlive-core-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/texlive-core-$pkgver-src.zip - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - bsdtar xf ../texlive-core-$pkgver-src.zip - # remove nonfree packages - # MeX licensed packages. - rm {cc-pl,cs,ec,mex,pl}.tar.xz - # Public domain, will be relicensed. - rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz - # No specific free license. - rm euro-ce.tar.xz - # Remove them from package list. - sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS - popd - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver} - rm -rf ${pkgname}-${pkgver} -} +md5sums=('c913b3c01bdcf81da80e4833cd4cc691' + '82c03f7226e1df4440f30c89c05ee653') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir" + + # remove nonfree packages + # MeX licensed packages. + rm {cc-pl,cs,ec,mex,pl}.tar.xz + # Public domain, will be relicensed. + rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz + # No specific free license. + rm euro-ce.tar.xz + # Remove them from package list. + sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS + echo -n " --> extracting all packages... " for p in *.tar.xz; do bsdtar -xf $p @@ -62,11 +55,10 @@ build() { } package() { - cd "$srcdir/${pkgname}-${pkgver}" install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 ${srcdir}/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do @@ -87,8 +79,9 @@ package() { # $pkgdir/etc/texmf/tex/context/config/cont-usr.tex # remove obsolete stuff (we don't provide the omega and aleph binaries anyway) - #rm -rf $pkgdir/usr/share/texmf-dist/omega rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini + sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \ + "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg" # more cleanup rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/ @@ -100,6 +93,7 @@ accfonts/vpl2vpl bundledoc/arlatex bundledoc/bundledoc context/perl/mptopdf.pl +checkcites/checkcites.lua ctanify/ctanify ctanupload/ctanupload.pl de-macro/de-macro @@ -108,17 +102,14 @@ epstopdf/epstopdf.pl findhyph/findhyph fontools/afm2afm fontools/autoinst -fontools/cmap2enc -fontools/font2afm fontools/ot2kpx -fontools/pfm2kpx -fontools/showglyphs fragmaster/fragmaster.pl installfont/installfont-tl latex2man/latex2man latexdiff/latexdiff-vc.pl latexdiff/latexdiff.pl latexdiff/latexrevise.pl +latexfileversion/latexfileversion latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua match_parens/match_parens @@ -148,6 +139,7 @@ texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl +typeoutfileinfo/typeoutfileinfo.sh texliveonfly/texliveonfly.py " install -m755 -d $pkgdir/usr/bin diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps index 553d07b72..013f15e94 100644 --- a/libre/texlive-core-libre/texlive-core.maps +++ b/libre/texlive-core-libre/texlive-core.maps @@ -4,6 +4,7 @@ Map fpls.map Map l7x-urwvn.map Map lm.map Map marvosym.map +Map mathpple.map Map original-context-symbol.map Map pazo.map Map pxfonts.map @@ -19,6 +20,7 @@ Map tabvar.map Map troff-updmap.map Map txfonts.map Map utopia.map +MixedMap ccpl.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map MixedMap cm-super-t2b.map @@ -28,10 +30,14 @@ MixedMap cm-super-x2.map MixedMap cm.map MixedMap cmextra.map MixedMap cmtext-bsr-interpolated.map +MixedMap csother.map +MixedMap cstext.map MixedMap cyrillic.map MixedMap eurosym.map MixedMap latxfont.map MixedMap mflogo.map +MixedMap plother.map +MixedMap pltext.map MixedMap rsfs.map MixedMap stmaryrd.map MixedMap symbols.map diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install index a758c084d..601c4af19 100644 --- a/libre/texlive-core-libre/texlive.install +++ b/libre/texlive-core-libre/texlive.install @@ -23,8 +23,8 @@ post_install() { usr/bin/fmtutil-sys --all 1>/dev/null echo " done." echo " (logs are under /var/lib/texmf/web2c//.log)" -# echo "NB: To setup ConTeXt and the lua(la)tex font db," -# echo " see http://wiki.archlinux.org/index.php/TeX_Live" + echo "NB: To setup ConTeXt and the lua(la)tex font db," + echo " see http://wiki.archlinux.org/index.php/TeX_Live" } post_upgrade() { @@ -45,8 +45,8 @@ post_upgrade() { usr/bin/fmtutil-sys --all 1>/dev/null echo " done." echo " (logs are under /var/lib/texmf/web2c//.log)" -# echo "NB: To setup ConTeXt and the lua(la)tex font db," -# echo " see http://wiki.archlinux.org/index.php/TeX_Live" + echo "NB: To setup ConTeXt and the lua(la)tex font db," + echo " see http://wiki.archlinux.org/index.php/TeX_Live" if [[ "$2" == 200* ]]; then echo "Important note. Some directories have moved:" echo " \$TEXMFSYSVAR is now /var/lib/texmf (previously /usr/share/texmf-var)" -- cgit v1.2.3-2-g168b From eede3877f6e1911e46573dea05d8c35641d4c5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 26 Jun 2012 23:00:59 -0300 Subject: texlive-fontsextra-libre-2012.26866-1: updating version --- libre/texlive-fontsextra-libre/PKGBUILD | 40 ++++++++-------------- .../texlive-fontsextra.maps | 5 +++ 2 files changed, 20 insertions(+), 25 deletions(-) (limited to 'libre') diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 5565b19b5..cabf58619 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -1,10 +1,11 @@ -# Parabola maintainer: Michał Masłowski # Maintainer: Rémy Oudompheng +# Maintainer (Parabola): Michał Masłowski +# Contributor (Parabola): André Silva pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2011.24706 -_revnr=${pkgver#2011.} +pkgver=2012.26866 +_revnr=${pkgver#2012.} pkgrel=1 pkgdesc="TeX Live - all sorts of extra fonts" license=('GPL') @@ -15,31 +16,20 @@ replaces=('texlive-fontsextra') conflicts=('texlive-fontsextra') provides=('texlive-fontsextra') url='http://tug.org/texlive/' -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" - "${_pkgname}.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('d4bd3dbc8c422d049b082d0e8c70d088' - '6e84e4a8ee6a25adec39cd6310d9bef2') - -mksource() { - [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - bsdtar xf ../${_pkgname}-$pkgver-src.zip - # remove nonfree packages - # No specific free license. - rm ogham.tar.xz - # Remove them from package list. - sed -ri '/^ogham /d' CONTENTS - popd - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver} - rm -rf ${pkgname}-${pkgver} -} +md5sums=('f75e552c4573ce73d3eee03fffee723f' + '4a2f2b3b4527655fb47ab0d59b01bfea') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir" + # remove nonfree packages + # No specific free license. + rm ogham.tar.xz + # Remove them from package list. + sed -ri '/^ogham /d' CONTENTS for p in *.tar.xz; do bsdtar -xf $p done @@ -47,11 +37,11 @@ build() { } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir" install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $srcdir/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index 4ef977ffa..fbced973a 100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -5,6 +5,7 @@ Map ArtNouv.map Map ArtNouvc.map Map BulletsADF.map Map Carrickc.map +Map CountriesOfEurope.map Map ESSTIX.map Map Eichenla.map Map Eileen.map @@ -31,6 +32,7 @@ Map ap.map Map archaicprw.map Map arev.map Map ascii.map +Map aspectratio.map Map augie.map Map auncial.map Map aurical.map @@ -77,7 +79,9 @@ Map linearA.map Map mathabx.map Map mdbch.map Map mdput.map +Map mdsymbol.map Map mdugm.map +Map ntx.map Map ocrb.map Map opensans.map Map paratype-type1.map @@ -87,6 +91,7 @@ Map prodint.map Map pxtx.map Map recycle.map Map rsfso.map +Map sansmathaccent.map Map sqrcaps.map Map starfont.map Map tfrupee.map -- cgit v1.2.3-2-g168b From 23333c5f52d8e67834b312e88de9047e9fb7504a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 26 Jun 2012 23:02:11 -0300 Subject: texlive-latexextra-libre-2012.26807-1: updating version --- libre/texlive-latexextra-libre/PKGBUILD | 42 ++++++++++++--------------------- 1 file changed, 15 insertions(+), 27 deletions(-) (limited to 'libre') diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 2093836c9..063a9e899 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,11 +1,12 @@ -# Parabola maintainer: Michał Masłowski # Maintainer: Firmicus # Maintainer: Rémy Oudompheng +# Maintainer (Parabola): Michał Masłowski +# Contributor (Parabola): André Silva pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra -pkgver=2011.24718 -_revnr=${pkgver#2011.} +pkgver=2012.26807 +_revnr=${pkgver#2012.} pkgrel=1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX" license=('GPL') @@ -20,44 +21,31 @@ replaces=('texlive-latexextra') conflicts=('texlive-latexextra') groups=('texlive-most') url='http://tug.org/texlive/' -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" - "${_pkgname}.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('adab55bb38506c25f3176af64cf30f27' +md5sums=('868dc1824391768e120fdd71ba28e520' '9e4825f47dac663dd62c4bfa67899e84') -mksource() { - [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - bsdtar xf ../${_pkgname}-$pkgver-src.zip - # remove nonfree packages - # No specific free license. - rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz - # No explicit modification permission. - rm cmdtrack.tar.xz - # Remove them from package list. - sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS - popd - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver} - rm -rf ${pkgname}-${pkgver} -} - build() { - cd "$srcdir/${pkgname}-${pkgver}" + # remove nonfree packages + # No specific free license. + rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz + # No explicit modification permission. + rm cmdtrack.tar.xz + # Remove them from package list. + sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS for p in *.tar.xz; do bsdtar -xf $p done rm -rf {tlpkg,doc,source} || true } package() { - cd "$srcdir/${pkgname}-${pkgver}" install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $srcdir/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do @@ -74,11 +62,11 @@ package() { #add symlinks that were in texlive-bin: install -m755 -d $pkgdir/usr/bin ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex $pkgdir/usr/bin/authorindex + ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex $pkgdir/usr/bin/exceltex ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries $pkgdir/usr/bin/makeglossaries ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl $pkgdir/usr/bin/pdfannotextractor ln -s /usr/share/texmf-dist/scripts/ppower4/pdfthumb.tlu $pkgdir/usr/bin/pdfthumb ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl $pkgdir/usr/bin/perltex - #ln -s /usr/share/texmf-dist/scripts/ppower4/ppower4.tlu $pkgdir/usr/bin/ppower4 ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf $pkgdir/usr/bin/ps4pdf ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl $pkgdir/usr/bin/splitindex ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl $pkgdir/usr/bin/svn-multi -- cgit v1.2.3-2-g168b From d5114f0ff6761703548ea2ed49816bb1dfb17095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 27 Jun 2012 01:52:53 -0300 Subject: texlive-latexextra-libre-2012.26807-1:fltpage cmdtrack aren't included in this version --- libre/texlive-latexextra-libre/PKGBUILD | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 063a9e899..d806b73fd 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -31,11 +31,9 @@ md5sums=('868dc1824391768e120fdd71ba28e520' build() { # remove nonfree packages # No specific free license. - rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz - # No explicit modification permission. - rm cmdtrack.tar.xz + rm {authoraftertitle,clock,fnpara}.tar.xz # Remove them from package list. - sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS + sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS for p in *.tar.xz; do bsdtar -xf $p done -- cgit v1.2.3-2-g168b From 64514c447bad5bbafd83d577d8d3ac0e0ce18493 Mon Sep 17 00:00:00 2001 From: Jorginho Date: Wed, 27 Jun 2012 21:02:01 +0200 Subject: delete hplip-libre (old version) --- libre/hplip-libre/PKGBUILD | 89 ----------------------------------------- libre/hplip-libre/hplip.install | 18 --------- libre/hplip-libre/rePKGBUILD | 26 ------------ 3 files changed, 133 deletions(-) delete mode 100644 libre/hplip-libre/PKGBUILD delete mode 100644 libre/hplip-libre/hplip.install delete mode 100644 libre/hplip-libre/rePKGBUILD (limited to 'libre') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD deleted file mode 100644 index b6bc8ce2f..000000000 --- a/libre/hplip-libre/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $ -# Maintainer: Tom Gundersen -# Maintainer : Rémy Oudompheng -# Contributor: Morgan LEFIEUX -# Maintainer (Parabola): Jorge López - -_pkgname=hplip -pkgname=hplip-libre -pkgver=3.12.6 -pkgrel=1 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" -arch=('i686' 'x86_64') -url="http://hplipopensource.com" -license=('GPL') -depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'net-snmp>=5.7.1') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') -optdepends=('cups: for printing support' - 'dbus-python: for dbus support' - 'sane: for scanner support' - 'python-imaging: for commandline scanning support' - 'python-notify: for Desktop notification support' - 'rpcbind: for network support' - 'python2-pyqt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox' - 'libusbx: for advanced usb support') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") -options=('!libtool') -install=hplip.install -source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('5303938e8630775ea6fb383af85775e5' - 'b562457e4c713d8609b3d6dd2be10baf') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - export PYTHON=python2 - - find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py - sed -i 's|python ./print.py|python2 ./print.py|' scan.py - sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py - sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py - sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - - # https://bugs.archlinux.org/task/30085 - hack found in Gentoo - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - - export AUTOMAKE='automake --foreign' - autoreconf --force --install - - ./configure --prefix=/usr \ - --enable-qt4 \ - --disable-foomatic-rip-hplip-install \ - --enable-foomatic-ppd-install \ - --enable-hpcups-install \ - --enable-new-hpcups \ - --enable-cups-ppd-install \ - --enable-cups-drv-install \ - --enable-hpijs-install \ - --enable-foomatic-drv-install \ - --enable-pp-build \ - --enable-udev-acl-rules #--help - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install - # remove config provided by sane and autostart of hp-daemon - rm -rf "$pkgdir"/etc/{sane.d,xdg} - # remove HAL .fdi file because HAL is no longer used - rm -rf "$pkgdir"/usr/share/hal - # move to /usr - mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/ - rm "$pkgdir"/lib -r -} diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install deleted file mode 100644 index 74532cde3..000000000 --- a/libre/hplip-libre/hplip.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - cat << EOF - -NOTE ----- -# If you want to use this driver with sane: -# echo "hpaio" >> /etc/sane.d/dll.conf - -EOF -} - -post_upgrade() { - if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then - # important upgrade notice - echo "> Please remove your printer in cups, then add it" - echo "> back and reconfigure it to make it work again!" - fi -} diff --git a/libre/hplip-libre/rePKGBUILD b/libre/hplip-libre/rePKGBUILD deleted file mode 100644 index 753b348e3..000000000 --- a/libre/hplip-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# This is an example rePKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Nicolas Reynolds -source PKGBUILD -CARCH=x86_64 -unset build package md5sums source check -_repo=extra -options=(!strip) -source=(PKGBUILD - http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} - # files for pkg modifications - ) - -build() { - cd "${srcdir}/" - rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true - # put actions for package modifications below this line -} - -package() { - find ${srcdir} -type l -maxdepth 1 -delete - cp -a ${srcdir}/* ${pkgdir} -} -- cgit v1.2.3-2-g168b From 2ecb70b29a4d14ebc72f8ec5f9026d350277b6de Mon Sep 17 00:00:00 2001 From: Jorginho Date: Wed, 27 Jun 2012 21:02:48 +0200 Subject: update hplip-libre --- libre/hplip-libre/PKGBUILD | 90 +++++++++++++++++++++++++++++++++++++++++ libre/hplip-libre/hplip.install | 18 +++++++++ 2 files changed, 108 insertions(+) create mode 100644 libre/hplip-libre/PKGBUILD create mode 100644 libre/hplip-libre/hplip.install (limited to 'libre') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD new file mode 100644 index 000000000..d8ce703b2 --- /dev/null +++ b/libre/hplip-libre/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $ +# Maintainer: Tom Gundersen +# Maintainer : Rémy Oudompheng +# Contributor: Morgan LEFIEUX +# Maintainer (Parabola): Jorge López + +_pkgname=hplip +pkgname=hplip-libre +pkgver=3.12.6 +pkgrel=2 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" +arch=('i686' 'x86_64') +url="http://hplipopensource.com" +license=('GPL') +depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' + 'net-snmp>=5.7.1') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') +optdepends=('cups: for printing support' + 'dbus-python: for dbus support' + 'sane: for scanner support' + 'python-imaging: for commandline scanning support' + 'python-notify: for Desktop notification support' + 'rpcbind: for network support' + 'python2-pyqt: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox' + 'libusbx: for advanced usb support') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") +options=('!libtool') +install=hplip.install +source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('5303938e8630775ea6fb383af85775e5' + 'b562457e4c713d8609b3d6dd2be10baf') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + export PYTHON=python2 + + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py + sed -i 's|python ./print.py|python2 ./print.py|' scan.py + sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py + sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + + + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo + # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip + # The hpcups driver does not use foomatic-rip + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + + export AUTOMAKE='automake --foreign' + autoreconf --force --install + + ./configure --prefix=/usr \ + --enable-qt4 \ + --disable-foomatic-rip-hplip-install \ + --enable-foomatic-ppd-install \ + --enable-hpcups-install \ + --enable-new-hpcups \ + --enable-cups-ppd-install \ + --enable-cups-drv-install \ + --enable-hpijs-install \ + --enable-foomatic-drv-install \ + --enable-pp-build \ + --enable-udev-acl-rules #--help + + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} + # remove HAL .fdi file because HAL is no longer used + rm -rf "$pkgdir"/usr/share/hal + # move to /usr + mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/ + rm "$pkgdir"/lib -r +} diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install new file mode 100644 index 000000000..74532cde3 --- /dev/null +++ b/libre/hplip-libre/hplip.install @@ -0,0 +1,18 @@ +post_install() { + cat << EOF + +NOTE +---- +# If you want to use this driver with sane: +# echo "hpaio" >> /etc/sane.d/dll.conf + +EOF +} + +post_upgrade() { + if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then + # important upgrade notice + echo "> Please remove your printer in cups, then add it" + echo "> back and reconfigure it to make it work again!" + fi +} -- cgit v1.2.3-2-g168b