From 008fd9bf7122fac32be212f5c8732b35cd72a2a9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 15 Jan 2014 17:04:02 -0200 Subject: kde packages: updating libre and nonprism packages to 4.12.1 version --- libre/kdebase-konqueror-libre/PKGBUILD | 6 +++--- libre/kdebase-runtime-libre/PKGBUILD | 6 +++--- libre/kdelibs-libre/PKGBUILD | 6 +++--- libre/kdenetwork-kopete-libre/PKGBUILD | 6 +++--- libre/kdepim-libre/PKGBUILD | 8 ++++---- libre/kdeutils-ark-libre/PKGBUILD | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'libre') diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 93d55bbac..9020ef239 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $ +# $Id: PKGBUILD 203722 2014-01-14 07:36:58Z svenstaro $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): Michał Masłowski @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6' +sha1sums=('a08013c4f3e7221e597f98c310c323e40e03d280' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 5be70de9c..98ad31071 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $ +# $Id: PKGBUILD 203694 2014-01-14 07:35:16Z svenstaro $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('7c077b5ff2839fee1cc55016cd6711da1abb584c' +sha1sums=('e62d0b6a8fea172ac4b36a16004f10161406872a' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 5929de23d..7204da87d 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $ +# $Id: PKGBUILD 203682 2014-01-14 07:33:57Z svenstaro $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('a510f9dc2675c5656af00a92f81b747129ff70d1' +sha1sums=('b6c1b22a0fc3c9789d29ffef4d24b41afdf357bb' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 4c44c40b9..4bb85b87c 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $ +# $Id: PKGBUILD 203932 2014-01-14 07:49:31Z svenstaro $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 pkgdesc='Instant Messenger, without Skype support' url='http://kde.org/applications/internet/kopete/' @@ -19,7 +19,7 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875') +sha1sums=('e6ad13cb81842961df0e6e9ecda309b47db0af29') prepare() { cd kopete-${pkgver} diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 96dca0a5d..911b45170 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $ +# $Id: PKGBUILD 203942 2014-01-14 07:50:06Z svenstaro $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva @@ -22,16 +22,16 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' - 'kde-agent' 'nepomuk-widgets' 'link-grammar') + 'nepomuk-widgets' 'link-grammar') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4') +sha1sums=('6ea8fb59a725885801460adc492ee53ab4676d59') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 84aaaad77..f3bd7ec31 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $ +# $Id: PKGBUILD 203980 2014-01-14 07:52:36Z svenstaro $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.12.0 +pkgver=4.12.1 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('d7b9fbf595b7fc7a67e52a8ad1f0977b07abd274' +sha1sums=('788e43ec97e9c3c60ce494c784ed41c298a7c8fd' 'a0a836950f185d9b2245204579f969203036fdec') build() { -- cgit v1.2.3 From f22b767f150a14d8a351a6b1930a8307cf664478 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 15 Jan 2014 19:57:56 -0200 Subject: ice{cat,weasel}-noscript-2.6.8.12-1: updating version --- libre/icecat-noscript/PKGBUILD | 6 +++--- libre/iceweasel-noscript/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index bfbb1e633..3bff180e8 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103700 2014-01-10 10:25:05Z spupykin $ +# $Id: PKGBUILD 104068 2014-01-15 09:48:41Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.11 +pkgver=2.6.8.12 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('ba1d61d4abbf664f9f04689710d895c1') +md5sums=('da4f024487e5ef057eb6377f8bd285b5') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 5c0c84158..09bfbe6e8 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103700 2014-01-10 10:25:05Z spupykin $ +# $Id: PKGBUILD 104068 2014-01-15 09:48:41Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.11 +pkgver=2.6.8.12 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('ba1d61d4abbf664f9f04689710d895c1') +md5sums=('da4f024487e5ef057eb6377f8bd285b5') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` -- cgit v1.2.3 From 0374681088f3fd8dd492066b08136ff1c1753c69 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 16 Jan 2014 00:57:26 -0200 Subject: rename sources URL to http://repo.parabolagnulinux/other/$pkg{base,name} --- libre/abuse-libre/PKGBUILD | 2 +- libre/angband-libre/PKGBUILD | 2 +- libre/bogofilter-libre/PKGBUILD | 2 +- libre/cdrkit-libre/PKGBUILD | 2 +- libre/clementine-libre/PKGBUILD | 2 +- libre/dvdrtools-libre/PKGBUILD | 2 +- libre/ghostscript-libre/PKGBUILD | 2 +- libre/lib32-mesa-demos-libre/PKGBUILD | 2 +- libre/lib32-sdl-libre/PKGBUILD | 2 +- libre/mesa-demos-libre/PKGBUILD | 2 +- libre/openexr-libre/PKGBUILD | 2 +- libre/p7zip-libre/PKGBUILD | 2 +- libre/povray-libre/PKGBUILD | 2 +- libre/psutils-libre/PKGBUILD | 2 +- libre/sdl-libre/PKGBUILD | 2 +- libre/stuntrally-data-libre/PKGBUILD | 2 +- libre/texlive-core-libre/PKGBUILD | 2 +- libre/texlive-fontsextra-libre/PKGBUILD | 2 +- libre/texlive-latexextra-libre/PKGBUILD | 2 +- libre/unzip-libre/PKGBUILD | 2 +- libre/xscreensaver-libre/PKGBUILD | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'libre') diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index d45de0416..26c5d1fbd 100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -21,7 +21,7 @@ makedepends=('gendesk' 'mesa-libgl' 'glu') install="$_pkgname.install" mksource=("http://abuse.zoy.org/raw-attachment/wiki/download/$_pkgname-$pkgver.tar.gz" 'non-claudio.patch') -source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver.tar.gz" +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" 'abuse.sh' 'default.abuserc' 'default.gamma.lsp') diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD index cf275f60d..13e58963b 100644 --- a/libre/angband-libre/PKGBUILD +++ b/libre/angband-libre/PKGBUILD @@ -21,7 +21,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses') mksource=("http://rephial.org/downloads/${pkgver:0:3}/${_pkgname}-v${pkgver}.tar.gz" 'libre.patch') -source=("https://repo.parabolagnulinux.org/sources/${pkgname}-v${pkgver}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-v${pkgver}.tar.gz") mksource() { cd "${srcdir}/${_pkgname}-v${pkgver}" diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD index 308fc6f3b..357e49752 100644 --- a/libre/bogofilter-libre/PKGBUILD +++ b/libre/bogofilter-libre/PKGBUILD @@ -14,7 +14,7 @@ url="http://bogofilter.sourceforge.net" depends=('db' 'perl' 'gsl') backup=('etc/bogofilter/bogofilter.cf') mksource=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2) -source=(https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2) mkmd5sums=('d0a5eebb3274b23ceabe766a6443a1c5') md5sums=('cce573e059d39a68cf78097dbfaa5b2d') provides=("${_pkgname}=${pkgver}") diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index fe2abff3c..a598a15f6 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -17,7 +17,7 @@ depends=('file' 'bzip2') optdepends=('perl: for dirsplit') makedepends=('cmake') mksource=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) -source=(https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver.tar.gz) +source=(https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) mkmd5sums=('efe08e2f3ca478486037b053acd512e9') md5sums=('SKIP') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 1bff45ce9..05eddf3ee 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -29,7 +29,7 @@ install=clementine.install mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e' '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') diff --git a/libre/dvdrtools-libre/PKGBUILD b/libre/dvdrtools-libre/PKGBUILD index 8d5742e0d..63a3fba1d 100644 --- a/libre/dvdrtools-libre/PKGBUILD +++ b/libre/dvdrtools-libre/PKGBUILD @@ -19,7 +19,7 @@ provides=("$_pkgname=$pkgver" 'cdrkit') conflicts=("$_pkgname" 'cdrkit') replaces=("$_pkgname") mksource=(ftp://ftp.archlinux.org/other/dvdrtools/$_pkgname-$pkgver.tar.gz) -source=(https://repo.parabolagnulinux.org/$pkgname-$pkgver.tar.gz) +source=(https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) mkmd5sums=('5707b7e877b853e258cd738938833006') md5sums=('2f5328b875b34b48f27b5ec4c26b35a6') diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index 5b977e4b5..d3e1c0724 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -22,7 +22,7 @@ replaces=('ghostscript') provides=("ghostscript=$pkgver") url="http://www.ghostscript.com/" mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) -source=(https://repo.parabolagnulinux.org/sources/ghostscript-libre-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2) options=('!libtool' '!makeflags') mkmd5sums=('7179bb1ed4f6f453147e6f7e1f210ce8') md5sums=('c9f6ffec6a07e06caba394d7ebdbbe9a') diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD index d096b5c00..83557c0a9 100644 --- a/libre/lib32-mesa-demos-libre/PKGBUILD +++ b/libre/lib32-mesa-demos-libre/PKGBUILD @@ -15,7 +15,7 @@ provides=("lib32-mesa-demos=$pkgver") replaces=('lib32-mesa-demos') conflicts=('lib32-mesa-demos') makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew') -source=(https://repo.parabolagnulinux.org/sources/mesa-demos-libre-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2) md5sums=('18225619a97e6900afd2b48a89dcbd4e') build() { diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD index e3f2da354..0488381ea 100644 --- a/libre/lib32-sdl-libre/PKGBUILD +++ b/libre/lib32-sdl-libre/PKGBUILD @@ -20,7 +20,7 @@ makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) optdepends=('lib32-alsa-lib: ALSA audio driver' 'lib32-libpulse: PulseAudio audio driver') options=('!libtool') -source=(https://repo.parabolagnulinux.org/sources/SDL-libre-${pkgver}.tar.gz +source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 0ea6a30cf..78ecbc563 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -16,7 +16,7 @@ replaces=('mesa-demos') conflicts=('mesa-demos') mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" 'mesa-demos-libre.patch') -source=("https://repo.parabolagnulinux.org/sources/mesa-demos-libre-${pkgver}.tar.bz2" +source=("https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2" 'LICENSE') mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828' '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f') diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD index ba11a2083..8580dbbce 100644 --- a/libre/openexr-libre/PKGBUILD +++ b/libre/openexr-libre/PKGBUILD @@ -21,7 +21,7 @@ mksource=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}- "https://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt" "https://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt" "https://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt") -source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) mksource() { diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index f1bce25ec..12b1d4bc1 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -22,7 +22,7 @@ optdepends=('wxgtk2.8: GUI' makedepends=('yasm' 'nasm' 'wxgtk2.8') mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" 'p7zip-libre.patch') -source=("https://repo.parabolagnulinux.org/sources/${pkgname}_${pkgver}_src_all.tar.bz2" +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2" '7zFM.desktop') mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed') diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD index dbbca2238..c75973f60 100644 --- a/libre/povray-libre/PKGBUILD +++ b/libre/povray-libre/PKGBUILD @@ -25,7 +25,7 @@ replaces=("$_pkgname") backup=("etc/povray/$pkgver/povray.conf" "etc/povray/$pkgver/povray.ini") mksource=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip") -source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-stable.tar.xz" +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-stable.tar.xz" 'povray3.7.0_rc3-user-conf.patch') mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb') sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1' diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index ad75af70a..0d61ca098 100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD @@ -20,7 +20,7 @@ conflicts=('psutils-lprng' 'psutils') options=('!makeflags') mksource=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz" 'libre.patch') -source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz" +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'psutils-1.17.diff') mkmd5sums=('b161522f3bd1507655326afa7db4a0ad' 'a4beaf371607085e89ef190c1db7aee3') diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 79dadf954..effbd1c23 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -23,7 +23,7 @@ optdepends=('alsa-lib: ALSA audio driver' options=('staticlibs') mksource=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz libre.patch) -source=(https://repo.parabolagnulinux.org/sources/SDL-libre-${pkgver}.tar.gz +source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD index 77bd49440..80bd44b01 100644 --- a/libre/stuntrally-data-libre/PKGBUILD +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -13,7 +13,7 @@ makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-the mksource=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz" "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz" libre.patch ) -source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver.tar.gz") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 246af9a3e..5ee62dc03 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -27,7 +27,7 @@ replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip") noextract=("$_pkgname-$pkgver-src.zip") -source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps" "texmf.cnf" "09-texlive-fonts.conf") diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 55a117c79..70f079049 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -18,7 +18,7 @@ provides=('texlive-fontsextra') url='http://tug.org/texlive/' mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip") noextract=("$_pkgname-$pkgver-src.zip") -source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index dce3903aa..cbdc46a12 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -27,7 +27,7 @@ groups=('texlive-most') url='http://tug.org/texlive/' mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip") noextract=("$_pkgname-$pkgver-src.zip") -source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD index b9e4550a4..2c4ce4150 100644 --- a/libre/unzip-libre/PKGBUILD +++ b/libre/unzip-libre/PKGBUILD @@ -17,7 +17,7 @@ conflicts=("${_pkgname}") replaces=("${_pkgname}") mksource=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' 'match.patch') -source=('https://repo.parabolagnulinux.org/sources/unzip60-libre.tar.gz') +source=('https://repo.parabolagnulinux.org/other/$pkgname/unzip60-libre.tar.gz') mkmd5sums=('62b490407489521db863b523a7f86375' 'e6d9f0c204c2abe6a57dc5e1637d5140') md5sums=('bbe4b7f4d48b2f939b5e43fde0ac7762') diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 1a63f6f79..8ab5ec06a 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -18,7 +18,7 @@ conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz) -source=(https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz \ +source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \ xscreensaver-add-electricsheep.diff LICENSE) mksha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc') sha1sums=('f041ac860f52fab79c438012ebf58a021ef9bfea' -- cgit v1.2.3 From 22fd4ebceb6013f9710a917785b23dd53bc40ebe Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 16 Jan 2014 14:45:33 -0200 Subject: midori-libre-0.5.7-1: updating version --- libre/midori-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD index 42d597740..ce506078d 100644 --- a/libre/midori-libre/PKGBUILD +++ b/libre/midori-libre/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 101597 2013-11-28 20:54:40Z arodseth $ -# Maintainer: Alexander Rødseth -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 104157 2014-01-16 12:49:27Z arodseth $ +# Maintainer: Alexander Rødseth +# Maintainer: Bartłomiej Piotrowski # Contributor: Andreas Radke # Contributor: rabyte # Contributor: Johannes Krampf @@ -9,8 +9,8 @@ _pkgname=midori pkgname=midori-libre -pkgver=0.5.6 -pkgrel=2 +pkgver=0.5.7 +pkgrel=1 pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' @@ -27,7 +27,7 @@ optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support' 'aria2: download utility') options=('!emptydirs') source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2") -sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a') +sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d') prepare() { cd "$_pkgname-$pkgver" -- cgit v1.2.3 From 02b538fae57cb275b5c34e9b6cff40fa8e02b116 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 16 Jan 2014 14:46:11 -0200 Subject: midori-gtk3-libre-0.5.7-1: updating version --- libre/midori-gtk3-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/midori-gtk3-libre/PKGBUILD b/libre/midori-gtk3-libre/PKGBUILD index 66083d847..9d6fc881b 100644 --- a/libre/midori-gtk3-libre/PKGBUILD +++ b/libre/midori-gtk3-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101601 2013-11-28 22:21:02Z arodseth $ +# $Id: PKGBUILD 104163 2014-01-16 14:14:27Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Bartłomiej Piotrowski # Contributor: Andreas Radke @@ -9,8 +9,8 @@ _pkgname=midori-gtk3 pkgname=midori-gtk3-libre -pkgver=0.5.6 -pkgrel=2 +pkgver=0.5.7 +pkgrel=1 pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' @@ -27,7 +27,7 @@ optdepends=('gst-plugins-base: HTML5 OGG videos support' 'aria2: download utility') options=('!emptydirs') source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2") -sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a') +sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d') prepare() { cd "${_pkgname/-gtk3}-$pkgver" -- cgit v1.2.3 From ae3b03e6f71122d847b932cbcd6863f2a9000494 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 17 Jan 2014 19:09:13 -0500 Subject: update libre/parabolaweb-utils --- libre/parabolaweb-utils/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index 185274efc..69ae3fbd3 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -1,15 +1,16 @@ # Maintainer: Luke Shumaker pkgname=(parabolaweb-utils parabolaweb-dev) -pkgver=20131128 +pkgver=20140117 pkgdesc="Utilities for managing the parabolaweb website application" url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/" license=('GPL2') # The commit to get dependency info for +# Bump pkgrel if updating this is the only change _parabolaweb_commit=86f1ed1ecc94a6a298eb3f690155b03bf013ca78 -pkgrel=2 +pkgrel=1 epoch=1 arch=('any') @@ -25,7 +26,7 @@ build() { package_parabolaweb-utils() { cd "$srcdir/$pkgbase-$pkgver" - depends=($(cat depends.txt)) + depends=($(< depends.txt)) backup=('etc/conf.d/parabolaweb') make install DESTDIR="$pkgdir" } @@ -36,5 +37,5 @@ package_parabolaweb-dev() { depends=($(sed -r -e 's/\s*#.*//' depends_make.txt)) } -md5sums=('e83933afda290bfc1fe0e51828c7ad41' +md5sums=('4543e360c0f5ecbfa3a4a51b2bd9131d' '4ed35e37e52f6b8607733c692702d319') -- cgit v1.2.3 From 2601f3544473f173f65e641bcb1ec1602933dfdb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 17 Jan 2014 22:50:08 -0200 Subject: linux-libre-lts-3.10.27-1: updating version --- libre/linux-libre-lts/3.10.6-logitech-dj.patch | 172 ------------------------- libre/linux-libre-lts/PKGBUILD | 15 +-- 2 files changed, 5 insertions(+), 182 deletions(-) delete mode 100644 libre/linux-libre-lts/3.10.6-logitech-dj.patch (limited to 'libre') diff --git a/libre/linux-libre-lts/3.10.6-logitech-dj.patch b/libre/linux-libre-lts/3.10.6-logitech-dj.patch deleted file mode 100644 index 1c112ccde..000000000 --- a/libre/linux-libre-lts/3.10.6-logitech-dj.patch +++ /dev/null @@ -1,172 +0,0 @@ -From c63e0e370028d7e4033bd40165f18499872b5183 Mon Sep 17 00:00:00 2001 -From: Nestor Lopez Casado -Date: Thu, 18 Jul 2013 13:21:30 +0000 -Subject: HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue"" - -This reverts commit 8af6c08830b1ae114d1a8b548b1f8b056e068887. - -This patch re-adds the workaround introduced by 596264082f10dd4 -which was reverted by 8af6c08830b1ae114. - -The original patch 596264 was needed to overcome a situation where -the hid-core would drop incoming reports while probe() was being -executed. - -This issue was solved by c849a6143bec520af which added -hid_device_io_start() and hid_device_io_stop() that enable a specific -hid driver to opt-in for input reports while its probe() is being -executed. - -Commit a9dd22b730857347 modified hid-logitech-dj so as to use the -functionality added to hid-core. Having done that, workaround 596264 -was no longer necessary and was reverted by 8af6c08. - -We now encounter a different problem that ends up 'again' thwarting -the Unifying receiver enumeration. The problem is time and usb controller -dependent. Ocasionally the reports sent to the usb receiver to start -the paired devices enumeration fail with -EPIPE and the receiver never -gets to enumerate the paired devices. - -With dcd9006b1b053c7b1c the problem was "hidden" as the call to the usb -driver became asynchronous and none was catching the error from the -failing URB. - -As the root cause for this failing SET_REPORT is not understood yet, --possibly a race on the usb controller drivers or a problem with the -Unifying receiver- reintroducing this workaround solves the problem. - -Overall what this workaround does is: If an input report from an -unknown device is received, then a (re)enumeration is performed. - -related bug: -https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1194649 - -Signed-off-by: Nestor Lopez Casado -Signed-off-by: Jiri Kosina ---- -diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c -index 5207591a..cd33084 100644 ---- a/drivers/hid/hid-logitech-dj.c -+++ b/drivers/hid/hid-logitech-dj.c -@@ -192,6 +192,7 @@ static struct hid_ll_driver logi_dj_ll_driver; - static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf, - size_t count, - unsigned char report_type); -+static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev); - - static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev, - struct dj_report *dj_report) -@@ -232,6 +233,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, - if (dj_report->report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] & - SPFUNCTION_DEVICE_LIST_EMPTY) { - dbg_hid("%s: device list is empty\n", __func__); -+ djrcv_dev->querying_devices = false; - return; - } - -@@ -242,6 +244,12 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, - return; - } - -+ if (djrcv_dev->paired_dj_devices[dj_report->device_index]) { -+ /* The device is already known. No need to reallocate it. */ -+ dbg_hid("%s: device is already known\n", __func__); -+ return; -+ } -+ - dj_hiddev = hid_allocate_device(); - if (IS_ERR(dj_hiddev)) { - dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n", -@@ -305,6 +313,7 @@ static void delayedwork_callback(struct work_struct *work) - struct dj_report dj_report; - unsigned long flags; - int count; -+ int retval; - - dbg_hid("%s\n", __func__); - -@@ -337,6 +346,25 @@ static void delayedwork_callback(struct work_struct *work) - logi_dj_recv_destroy_djhid_device(djrcv_dev, &dj_report); - break; - default: -+ /* A normal report (i. e. not belonging to a pair/unpair notification) -+ * arriving here, means that the report arrived but we did not have a -+ * paired dj_device associated to the report's device_index, this -+ * means that the original "device paired" notification corresponding -+ * to this dj_device never arrived to this driver. The reason is that -+ * hid-core discards all packets coming from a device while probe() is -+ * executing. */ -+ if (!djrcv_dev->paired_dj_devices[dj_report.device_index]) { -+ /* ok, we don't know the device, just re-ask the -+ * receiver for the list of connected devices. */ -+ retval = logi_dj_recv_query_paired_devices(djrcv_dev); -+ if (!retval) { -+ /* everything went fine, so just leave */ -+ break; -+ } -+ dev_err(&djrcv_dev->hdev->dev, -+ "%s:logi_dj_recv_query_paired_devices " -+ "error:%d\n", __func__, retval); -+ } - dbg_hid("%s: unexpected report type\n", __func__); - } - } -@@ -367,6 +395,12 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev, - if (!djdev) { - dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]" - " is NULL, index %d\n", dj_report->device_index); -+ kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report)); -+ -+ if (schedule_work(&djrcv_dev->work) == 0) { -+ dbg_hid("%s: did not schedule the work item, was already " -+ "queued\n", __func__); -+ } - return; - } - -@@ -397,6 +431,12 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev, - if (dj_device == NULL) { - dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]" - " is NULL, index %d\n", dj_report->device_index); -+ kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report)); -+ -+ if (schedule_work(&djrcv_dev->work) == 0) { -+ dbg_hid("%s: did not schedule the work item, was already " -+ "queued\n", __func__); -+ } - return; - } - -@@ -444,6 +484,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) - struct dj_report *dj_report; - int retval; - -+ /* no need to protect djrcv_dev->querying_devices */ -+ if (djrcv_dev->querying_devices) -+ return 0; -+ - dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL); - if (!dj_report) - return -ENOMEM; -@@ -455,6 +499,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) - return retval; - } - -+ - static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, - unsigned timeout) - { -diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h -index fd28a5e..4a40003 100644 ---- a/drivers/hid/hid-logitech-dj.h -+++ b/drivers/hid/hid-logitech-dj.h -@@ -101,6 +101,7 @@ struct dj_receiver_dev { - struct work_struct work; - struct kfifo notif_fifo; - spinlock_t lock; -+ bool querying_devices; - }; - - struct dj_device { --- -cgit v0.9.2 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3d027c7ec..685d70501 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203427 2014-01-10 20:21:13Z andyrtr $ +# $Id: PKGBUILD 204271 2014-01-16 08:13:43Z bpiotrowski $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=26 +_sublevel=27 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.26 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.27 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - 'b04f41f84f48724609baac04282e9755' + '20d0ea2ae02745d7a525126a3b8a5ce7' '85ce008eaacbb2fc54b81116d35cf946' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' @@ -42,8 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '3ff40ca684cfe719723e627e2cef7cea' - '040015fc338ec1a35616e72bade6bdc2') + '7e5b9d817f296a7e305f2262a00b9fb3') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -72,9 +70,6 @@ prepare() { # patch from fedora patch -Np1 -i "${srcdir}/criu-no-expert.patch" - # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless - patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ -- cgit v1.2.3 From 0bc6eafdc80c6699c12d195f4bd8cf7307a5bf59 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 17 Jan 2014 22:56:05 -0200 Subject: calibre-libre-1.20.0-1: updating version --- libre/calibre-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 799e57b23..0b72e8498 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103745 2014-01-11 10:18:19Z jelle $ +# $Id: PKGBUILD 104291 2014-01-17 08:53:47Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.19.0 +pkgver=1.20.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('5ce57bf48ed7f534fe9d5c55157dd15a' +md5sums=('463cdfaa008a2aa16343876b77ae4e17' '95ca4eb3afa7c737c8371708a23bdad9' '675cd87d41342119827ef706055491e7') -- cgit v1.2.3 From e8c7d42f73945b0fc566fa9b7e278384ee9ece97 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 17 Jan 2014 22:56:38 -0200 Subject: hplip-libre-3.14.1-1: updating version --- libre/hplip-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index c5015aa7a..4ed863e35 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201437 2013-12-11 16:52:25Z andyrtr $ +# $Id: PKGBUILD 204311 2014-01-17 09:00:06Z andyrtr $ # Maintainer: Tom Gundersen # Contributor : Rémy Oudompheng # Contributor: Morgan LEFIEUX @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.11 -pkgrel=2.1 +pkgver=3.14.1 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -31,7 +31,7 @@ provides=$_pkgname=$pkgver install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch) -md5sums=('8ee362d9bc45fd4eddd3c9d9e583d728' +md5sums=('11eb45f3d3edf1f03887fd13afc61b51' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') -- cgit v1.2.3 From b3e104e703daa6b36c9ddc486b558d18f1bcebd0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 17 Jan 2014 22:57:11 -0200 Subject: liferea-libre-1.10.5-1: updating version --- libre/liferea-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 313e81327..6dd3bc747 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 203676 2014-01-14 01:46:42Z eric $ +# $Id: PKGBUILD 204300 2014-01-16 22:28:49Z eric $ # Maintainer: Eric Bélanger # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.4 +pkgver=1.10.5 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -24,9 +24,9 @@ optdepends=('gnome-keyring: for keyring plugin support' 'gst-plugins-bad-libre: for media player plugin support') options=('!emptydirs') install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 +source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('7ee44bff223cd3112c54399de04e9fa750ac3f6a' +sha1sums=('a2378f2ba117fcc6475f82d961515adc367ef535' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { -- cgit v1.2.3 From 8b18bd870eabff231aa1c6dff3f119f10ad13c8e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 17 Jan 2014 22:58:06 -0200 Subject: tp_smapi-libre-lts-0.41-23: rebuild against linux-libre-lts-3.10.27-1 --- libre/tp_smapi-libre-lts/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 074565a42..de5c899c6 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103753 2014-01-11 11:28:49Z bpiotrowski $ +# $Id: PKGBUILD 104131 2014-01-16 08:33:59Z bpiotrowski $ # Maintainer: Lukas Fleischer # Contributor: xduugu # Contributor: nh2 @@ -13,7 +13,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS pkgver=0.41 -pkgrel=22 +pkgrel=23 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' -- cgit v1.2.3 From 291a3d8a6ad75bb0f98a8823681a31438f107e15 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 18 Jan 2014 04:13:22 -0200 Subject: cups-filters-libre-1.0.44-1: updating version --- libre/cups-filters-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 528649cb4..6302e95ff 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 202372 2013-12-21 13:31:03Z andyrtr $ +# $Id: PKGBUILD 204359 2014-01-17 21:38:41Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.43 +pkgver=1.0.44 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('d1dbd200845db729bf18817f3a49c2c1') +md5sums=('41d853788cf8e176f952136549488d34') build() { cd $_pkgname-$pkgver -- cgit v1.2.3 From dbde7ac5b94733e6d5baaf6fd332323afb4de4e5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 04:18:02 -0200 Subject: ecasound-libre-2.9.1-1: updating version --- libre/ecasound-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre') diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index c8f98dadf..3dc82648c 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 199462 2013-11-13 08:34:51Z schiv $ +# $Id: PKGBUILD 204375 2014-01-18 15:02:17Z schiv $ # Maintainer: Ray Rashif # Contributor: Eric Belanger # Contributor: Tom Newsom @@ -6,9 +6,9 @@ _pkgname=ecasound pkgname=ecasound-libre -pkgver=2.9.0 -pkgrel=4 -pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation" +pkgver=2.9.1 +pkgrel=1 +pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation" arch=('i686' 'x86_64') url="http://www.eca.cx/ecasound/" license=('GPL' 'LGPL') @@ -27,7 +27,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz" 'ruby2.patch') -md5sums=('05e7d4664cdf4c7a138c098e9506a551' +md5sums=('13c7be1e4eddc0bbf3792dc17777e465' '6909dbd4f67f76d3bd31ce7c7fe16212') build() { -- cgit v1.2.3 From 03c321057eb30cddc321fa136ea745ff58f6de78 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 04:20:20 -0200 Subject: cups-filters-libre-1.0.44-2: fix cups socket directory --- libre/cups-filters-libre/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 6302e95ff..8d35a9f13 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204359 2014-01-17 21:38:41Z andyrtr $ +# $Id: PKGBUILD 204369 2014-01-18 10:14:32Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.44 -pkgrel=1 +pkgrel=2 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" @@ -27,6 +27,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ + --localstatedir=/var \ --with-rcdir=no \ --enable-avahi \ --with-browseremoteprotocols=DNSSD,CUPS \ -- cgit v1.2.3 From 423bbb78077be07ef3f7eec10c15a3f74ca29458 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 20:21:59 -0200 Subject: audacious-plugins-libre-3.4.3-2: rebuild against libcdio-0.92-1 --- libre/audacious-plugins-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 5f3c0e327..57c1440f5 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203196 2014-01-05 05:25:28Z bisson $ +# $Id: PKGBUILD 204037 2014-01-14 11:53:55Z jgc $ # Maintainer: Gaetan Bisson # Contributor: Alexander Fehr # Contributor: William Rea @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4.3 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') -- cgit v1.2.3 From 1076893224905d3b85d21eda3c7b7c180408b509 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 20:26:28 -0200 Subject: clementine-libre-1.2.1-2: rebuild against libcdio-0.92-1 --- libre/clementine-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 05eddf3ee..5bebf2bb6 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101521 2013-11-26 23:05:03Z alucryd $ +# $Id: PKGBUILD 103980 2014-01-14 12:52:23Z jgc $ # Maintainer: Maxime Gauduin # Contributor: Stéphane Gaudreault # Contributor: BlackEagle @@ -10,7 +10,7 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') -- cgit v1.2.3 From f61f807bc51491149912be112229bf36367f42b7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 20:35:25 -0200 Subject: mplayer-libre-36498-5: rebuild against libcdio-0.92-1 --- libre/mplayer-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 75a1fefd2..8ca2fda87 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200344 2013-11-26 19:19:01Z bpiotrowski $ +# $Id: PKGBUILD 204039 2014-01-14 12:09:50Z jgc $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36498 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' -- cgit v1.2.3 From 21eddd18c6ecd944e971ab7c94b96f869364c99d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 20:36:39 -0200 Subject: mplayer-vaapi-libre-36265-8: rebuild against libcdio-0.92-1 --- libre/mplayer-vaapi-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index b5bf62590..c18745c87 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103207 2013-12-30 05:16:47Z bpiotrowski $ +# $Id: PKGBUILD 104019 2014-01-14 16:12:02Z bpiotrowski $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria @@ -9,7 +9,7 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=36265 -pkgrel=7 +pkgrel=8 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" -- cgit v1.2.3 From ac5888822a41cdf5b929fd492cf3dfa02e186560 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 19 Jan 2014 20:38:08 -0200 Subject: xbmc-libre-12.3-6: rebuild against libcdio-0.92-1 --- libre/xbmc-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 78cfc875b..17917185e 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103624 2014-01-08 12:23:08Z spupykin $ +# $Id: PKGBUILD 103998 2014-01-14 14:56:47Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -11,7 +11,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=5 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" -- cgit v1.2.3 From 798e0029a8b8ba950b4ef20a2b229e06f3086dd2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 20 Jan 2014 20:48:25 -0200 Subject: linux-libre-3.12.8-1: updating version --- libre/linux-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ebf30af10..7d32cd7ad 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $ +# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -38,7 +38,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'c42ff446236915fe1a6e2b6f9724d267' + '392f920129940c4f83c7d204468213f3' '568ce15a9df133072489cbac8c4fefb3' '772873c548059c57c8ec7898f35c0e2b' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -53,7 +53,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '7554da820df91c282656972976d9e0b5') + '0569e96c071703cc244f1ea7ee87d40a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3 From 3a4442cb264557db9ef544c1a1f1b38d2061827a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 20 Jan 2014 17:58:33 -0500 Subject: update libre/dpkg --- libre/dpkg/PKGBUILD | 185 ++++++++++++++++++++--------------- libre/dpkg/dpkg-gzip-rsyncable.patch | 19 ++-- 2 files changed, 115 insertions(+), 89 deletions(-) (limited to 'libre') diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 806194577..99681df3e 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -12,20 +12,38 @@ pkgname=(dpkg-devtools perl-dpkg) pkgdesc="Debian Package manager and utilities" license=('GPL2') -pkgver=1.16.10 +pkgver=1.17.6 url="http://packages.debian.org/source/sid/dpkg" -_debrepo=http://ftp.debian.org/debian/pool/main - -pkgrel=1.3 -arch=('i686' 'x86_64' 'mips64el') -depends=('bzip2' 'xz' 'zlib' 'ncurses') -checkdepends=('perl-test-pod') -makedepends=('perl-io-string' 'perl-timedate') +pkgrel=1 +options=('staticlibs') + +if ! type in_array &>/dev/null; then + in_array() { + local i + for i in "${@:2}"; do [[ $i = "$1" ]] && return 0; done + return 1 + } +fi + +# The architecture dependent bits aren't packaged with the reduced pkgname +arch=('any') +for _pkg in dpkg dselect libdpkg; do + if in_array "$_pkg" "${pkgname[@]}"; then + arch=('i686' 'x86_64' 'mips64el') + fi +done +unset _pkg + +makedepends=('bzip2' 'xz' 'zlib' 'ncurses') +checkdepends=('gzip' 'perl-test-pod' 'perl-io-string' 'perl-timedate') -_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } -source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz" +_debrepo=http://ftp.debian.org/debian/pool/main +_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } +source=("$(_debfile ${pkgbase}_${pkgver}).tar.xz" dpkg-gzip-rsyncable.patch) +md5sums=('c87f2ae291d460015353e01d121bea85' + '9c77a553e3219dcd29b7ff44b89d718d') ###################################################################### @@ -34,97 +52,104 @@ source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz" # Shame on the dpkg developers for not putting that logic into the build system. _destdir="$pkgbase-$pkgver/debian/pkg-makepkg" _debhelper_install() { - local debname=$1 - cd "$srcdir/$_destdir" - - # main files - sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ - | while read pattern dest; do - if [[ -z $dest ]]; then - for file in $pattern; do - install -d "$pkgdir/${file%/*}" - cp -a "$file" "$pkgdir/$file" || true - done - else - install -d "$pkgdir/$dest/" - cp -a "$pattern" "$pkgdir/$dest/" || true - fi - done - - # manpages - sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \ - | while read pattern; do - for file in $pattern; do - install -d "$pkgdir/${file%/*}" - cp -a "$file" "$pkgdir/$file" || true - done - done - - # other documentation - install -d "$pkgdir/usr/share/doc/$pkgname/" - sed '/^\s*$/d' ../$debname.docs 2>/dev/null \ - | while read file; do - gzip \ - < "$srcdir/$pkgbase-$pkgver/$file" \ - > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" - done - - # symlinks - sed '/^\s*$/d' ../$debname.links 2>/dev/null \ - | while read file link; do - ln -s "/$file" "$pkgdir/$link" - done + local debname=$1 + cd "$srcdir/$_destdir" + + # main files + sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install | + while read pattern dest; do + if [[ -z $dest ]]; then + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + else + install -d "$pkgdir/$dest/" + cp -a "$pattern" "$pkgdir/$dest/" || true + fi + done + + # manpages + sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null | + while read pattern; do + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + done + + # other documentation + sed '/^\s*$/d' ../$debname.docs 2>/dev/null | + while read file; do + install -d "$pkgdir/usr/share/doc/$pkgname/" + gzip \ + < "$srcdir/$pkgbase-$pkgver/$file" \ + > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" + done + + # symlinks + sed '/^\s*$/d' ../$debname.links 2>/dev/null | + while read file link; do + ln -s "/$file" "$pkgdir/$link" + done } ###################################################################### -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + # {Arch Linux,Parabola}'s gzip doesn't support --rsyncable + patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch" +} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma - make - make DESTDIR="$srcdir/$_destdir" install +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --localstatedir=/var \ + --with-zlib \ + --with-liblzma \ + --with-bz2 + make + make DESTDIR="$srcdir/$_destdir" install } check() { - cd "${srcdir}/${pkgbase}-${pkgver}" - make check + cd "${srcdir}/${pkgbase}-${pkgver}" + make check } package_dpkg() { - pkgdesc="Debian Package manager" - provides+=(start-stop-daemon) - conflicts+=(start-stop-daemon) - _debhelper_install dpkg + pkgdesc="Debian Package manager" + depends=('zlib' 'xz' 'bzip2') + _debhelper_install dpkg } package_dpkg-devtools() { - pkgdesc="Debian Package development tools" - arch=(any) - depends+=(perl-dpkg) - _debhelper_install dpkg-dev + pkgdesc="Debian Package development tools" + arch=('any') + depends=('perl-dpkg') + _debhelper_install dpkg-dev } package_dselect() { - pkgdesc="Debian Package manager high-level interface" - _debhelper_install dselect + pkgdesc="Debian Package manager high-level interface" + depends=('dpkg' 'perl' 'ncurses') + _debhelper_install dselect } package_libdpkg() { - pkgdesc="Debian Package manager library (static)" - _debhelper_install libdpkg-dev + pkgdesc="Debian Package manager library (static)" + _debhelper_install libdpkg-dev } package_perl-dpkg() { - pkgdesc="Debian Package perl modules" - arch=(any) - _debhelper_install libdpkg-perl + pkgdesc="Debian Package Perl modules" + arch=('any') + depends=('perl-timedate' 'gzip' 'bzip2' 'xz') + _debhelper_install libdpkg-perl } - -md5sums=('4df9319b2d17e19cdb6fe94dacee44da' - '5ab63758999e9bb10f84bce79a0307b2' - '74b7ce3045690a8fc290104f10cf8d42') -md5sums=('a20a06a5272717274a8b009368f237da' - '5ab63758999e9bb10f84bce79a0307b2') diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch index 3daf6d76e..187633874 100644 --- a/libre/dpkg/dpkg-gzip-rsyncable.patch +++ b/libre/dpkg/dpkg-gzip-rsyncable.patch @@ -1,11 +1,12 @@ ---- ./scripts/Dpkg/Compression.pm.orig 2012-04-27 04:49:02.000000000 +0200 -+++ ./scripts/Dpkg/Compression.pm 2012-05-27 22:23:18.530628795 +0200 -@@ -52,7 +52,7 @@ +diff -ruN dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm dpkg-1.17.6/scripts/Dpkg/Compression.pm +--- dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm 2014-01-15 09:02:16.000000000 -0500 ++++ dpkg-1.17.6/scripts/Dpkg/Compression.pm 2014-01-19 23:22:39.771215424 -0500 +@@ -50,7 +50,7 @@ my $COMP = { - "gzip" => { - "file_ext" => "gz", -- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ], -+ "comp_prog" => [ "gzip", "--no-name" ], - "decomp_prog" => [ "gunzip" ], - "default_level" => 9, + gzip => { + file_ext => 'gz', +- comp_prog => [ 'gzip', '--no-name', '--rsyncable' ], ++ comp_prog => [ 'gzip', '--no-name' ], + decomp_prog => [ 'gunzip' ], + default_level => 9, }, -- cgit v1.2.3 From 28671217c2249ebc8c65631900bcf895a90f480b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 20 Jan 2014 21:06:04 -0200 Subject: rebuild packages against linux-libre-3.12.8-1 --- libre/bbswitch-libre/PKGBUILD | 4 ++-- libre/lirc-libre/PKGBUILD | 4 ++-- libre/tp_smapi-libre/PKGBUILD | 4 ++-- libre/vhba-module-libre/PKGBUILD | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libre') diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 3c6f1ba33..745c3fce3 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103710 2014-01-10 12:51:56Z tpowa $ +# $Id: PKGBUILD 104385 2014-01-19 20:27:05Z tpowa $ # Maintainer: Sven-Hendrik Haase # Contributor: M0Rf30 # Contributor: Samsagax @@ -8,7 +8,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 _extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install -pkgrel=4 +pkgrel=5 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 8d2f988bc..277f31c7c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203411 2014-01-10 12:51:03Z tpowa $ +# $Id: PKGBUILD 204436 2014-01-19 20:29:01Z tpowa $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-libre-utils') pkgver=0.9.0 -pkgrel=68 +pkgrel=69 epoch=1 _extramodules=extramodules-3.12-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index e4d5a6879..4b53e4463 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103716 2014-01-10 12:53:25Z tpowa $ +# $Id: PKGBUILD 104391 2014-01-19 20:28:42Z tpowa $ # Maintainer: Lukas Fleischer # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=42 +pkgrel=43 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 0b1ae56c2..ed87b2b70 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103718 2014-01-10 12:54:19Z tpowa $ +# $Id: PKGBUILD 104393 2014-01-19 20:29:02Z tpowa $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.12-LIBRE -pkgrel=22 +pkgrel=23 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" -- cgit v1.2.3 From c2a567f3bdc03bbfc7917c377e25c12de14d319a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 21 Jan 2014 16:27:24 -0200 Subject: linux-libre-tools-3.13-1: updating version --- libre/linux-libre-tools/01-fix-perf-python.patch | 12 +++ libre/linux-libre-tools/PKGBUILD | 117 ++++++++++++++++++----- 2 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 libre/linux-libre-tools/01-fix-perf-python.patch (limited to 'libre') diff --git a/libre/linux-libre-tools/01-fix-perf-python.patch b/libre/linux-libre-tools/01-fix-perf-python.patch new file mode 100644 index 000000000..d46bd773c --- /dev/null +++ b/libre/linux-libre-tools/01-fix-perf-python.patch @@ -0,0 +1,12 @@ +--- a/tools/perf/config/feature-checks/Makefile 2014-01-21 01:58:25.444339009 +0100 ++++ b/tools/perf/config/feature-checks/Makefile 2014-01-21 01:46:58.081780576 +0100 +@@ -103,9 +103,6 @@ + test-libperl: + $(BUILD) $(FLAGS_PERL_EMBED) + +-override PYTHON := python +-override PYTHON_CONFIG := python-config +- + escape-for-shell-sq = $(subst ','\'',$(1)) + shell-sq = '$(escape-for-shell-sq)' + diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 78c0f4ea2..b29cde39e 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,19 +1,24 @@ -# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $ +# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $ # Maintainer: Sébastien Luttringer # Maintainer (Parabola): André Silva pkgbase=linux-libre-tools -pkgname=('linux-libre-tools-meta' - 'libtraceevent-libre' - 'perf-libre' - 'cpupower-libre' - 'x86_energy_perf_policy-libre' - 'usbip-libre') -_basekernel=3.12 -_sublevel=3 -_pkgver=$_basekernel.$_sublevel +pkgname=( + 'acpidump-libre' + 'cgroup_event_listener-libre' + 'cpupower-libre' + 'libtraceevent-libre' + 'linux-libre-tools-meta' + 'perf-libre' + 'tmon-libre' + 'usbip-libre' + 'x86_energy_perf_policy-libre' +) +_basekernel=3.13 +#_sublevel=3 +#_pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=2 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -22,24 +27,28 @@ options=('!strip') # kernel source deps makedepends=('asciidoc' 'xmlto') # perf-libre deps -makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') +makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl') # cpupower-libre deps makedepends+=('pciutils') # usbip-libre deps makedepends+=('glib2' 'sysfsutils') +# tmon-libre deps +makedepends+=('ncurses') groups=("$pkgbase") source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz" + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz" 'cpupower.default' 'cpupower.systemd' 'cpupower.service' - 'usbipd.service') + 'usbipd.service' + '01-fix-perf-python.patch') sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237' '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' - '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' + 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a') prepare() { # apply stable patching set @@ -52,36 +61,37 @@ prepare() { } build() { - msg2 'Build libtraceevent-libre' + msg2 'libtraceevent-libre' pushd linux-$pkgver/tools/lib/traceevent make popd - msg2 'Build perf-libre' + msg2 'perf-libre' pushd linux-$pkgver/tools/perf make \ WERROR=0 \ DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ all man popd - msg2 'Build cpupower-libre' + msg2 'cpupower-libre' pushd linux-$pkgver/tools/power/cpupower # we cannot use --as-needed - LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} + #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} make VERSION=$pkgver-$pkgrel popd - msg2 'Build x86_energy_perf_policy-libre' + msg2 'x86_energy_perf_policy-libre' pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy make popd - msg2 'Build usbip-libre' + msg2 'usbip-libre' pushd linux-$pkgver/drivers/staging/usbip/userspace # fix missing man page sed -i 's/usbip_bind_driver.8//' Makefile.am @@ -89,12 +99,37 @@ build() { ./configure --prefix=/usr --sbindir=/usr/bin make popd + + msg2 'tmon-libre' + pushd linux-$pkgver/tools/thermal/tmon + make + popd + + msg2 'acpidump-libre' + pushd linux-$pkgver/tools/power/acpi + make + popd + + msg2 'cgroup_event_listener-libre' + pushd linux-$pkgver/tools/cgroup + make + popd } package_linux-libre-tools-meta() { pkgdesc='Linux kernel tools meta package' groups=() - depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') + depends=( + 'acpidump-libre' + 'cgroup_event_listener-libre' + 'cpupower-libre' + 'libtraceevent-libre' + 'linux-libre-tools-meta' + 'perf-libre' + 'tmon-libre' + 'usbip-libre' + 'x86_energy_perf_policy-libre' + ) replaces=('linux-tools-meta') conflicts=('linux-tools-meta') provides=("linux-tools-meta=$pkgver") @@ -114,7 +149,8 @@ package_libtraceevent-libre() { package_perf-libre() { pkgdesc='Linux kernel performance auditing tool' - depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils') + depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils' + 'numactl') replaces=('perf') conflicts=('perf') provides=("perf=$pkgver") @@ -125,6 +161,7 @@ package_perf-libre() { DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ install install-man @@ -186,4 +223,38 @@ package_usbip-libre() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } +package_tmon-libre() { + pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem' + depends=('glibc' 'ncurses') + replaces=('tmon') + conflicts=('tmon') + provides=("tmon=$pkgver") + + cd linux-$pkgver/tools/thermal/tmon + make install INSTALL_ROOT="$pkgdir" +} + +package_acpidump-libre() { + pkgdesc='Dump system ACPI tables to an ASCII file' + depends=('glibc') + replaces=('acpidump') + conflicts=('acpidump' 'iasl') + provides=("acpidump=$pkgver") + + cd linux-$pkgver/tools/power/acpi + install -Dm755 acpidump "$pkgdir/usr/bin/acpidump" + install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8" +} + +package_cgroup_event_listener-libre() { + pkgdesc='Simple listener of cgroup events' + depends=('glibc') + replaces=('cgroup_event_listener') + conflicts=('cgroup_event_listener') + provides=("cgroup_event_listener=$pkgver") + + cd linux-$pkgver/tools/cgroup + install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener" +} + # vim:set ts=2 sw=2 et: -- cgit v1.2.3 From f7b0f445b01002c9ba3fb57bafc5b0b22783c61c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 21 Jan 2014 16:56:49 -0200 Subject: linux-libre-tools: fix checksums --- libre/linux-libre-tools/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index b29cde39e..060d84bf2 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -42,8 +42,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/ 'cpupower.service' 'usbipd.service' '01-fix-perf-python.patch') -sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237' - '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' +sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96' + #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' -- cgit v1.2.3 From 4bd60a24f1976e63cf40667397200d568f479e48 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 21 Jan 2014 20:27:02 -0200 Subject: xbmc-libre-12.3-7: fix FS#38575 => https://bugs.archlinux.org/task/38575 --- libre/xbmc-libre/PKGBUILD | 12 ++++++------ libre/xbmc-libre/polkit.rules | 19 ++++++++++--------- libre/xbmc-libre/xbmc.install | 11 ++++++----- 3 files changed, 22 insertions(+), 20 deletions(-) (limited to 'libre') diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 17917185e..7055b9d4f 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103998 2014-01-14 14:56:47Z spupykin $ +# $Id: PKGBUILD 104461 2014-01-21 08:35:40Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -11,7 +11,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=6 +pkgrel=7 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -27,7 +27,7 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'lirc-libre: remote controller support' 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' + 'upower: used to trigger power management functionality' 'libarchive: access compressed files without unpacking them' 'xorg-xinit: autostart xbmc') install="${_pkgname}.install" @@ -40,7 +40,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") md5sums=('7ae385ebf8e5cfcb917393235e6efbdb' '8312d6d4ac5d7c3d9eed40ab08a17d3b' - 'd4cbb6609c8e7b713c714241f529000e' + '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') prepare() { @@ -121,7 +121,7 @@ package() { done install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service - install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules - chmod 0700 $pkgdir/etc/polkit-1/rules.d/ + install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules + chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules index 5bc7e69f5..4b6d0fda0 100644 --- a/libre/xbmc-libre/polkit.rules +++ b/libre/xbmc-libre/polkit.rules @@ -1,11 +1,12 @@ polkit.addRule(function(action, subject) { - if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) { - return polkit.Result.YES; - } -}); - -polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) { - return polkit.Result.YES; - } + if (subject.user == "xbmc") { + polkit.log("action=" + action); + polkit.log("subject=" + subject); + if (action.id.indexOf("org.freedesktop.login1.") == 0) { + return polkit.Result.YES; + } + if (action.id.indexOf("org.freedesktop.udisks.") == 0) { + return polkit.Result.YES; + } + } }); diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 04396af45..7fc45751a 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -1,10 +1,10 @@ post_install() { [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent group xbmc > /dev/null || groupadd xbmc - getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc + getent group xbmc > /dev/null || groupadd -r xbmc + getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc - chown -R 102:0 etc/polkit-1 + chown -R xbmc:xbmc var/lib/xbmc } post_upgrade() { @@ -12,6 +12,7 @@ post_upgrade() { } post_remove() { - post_install $1 - echo "You may want to remove xbmc user and group" + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + getent passwd xbmc > /dev/null || userdel xbmc } -- cgit v1.2.3 From 182f7683a74e0838c85245376af173ecb46fd8d4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 21 Jan 2014 20:22:07 -0500 Subject: mv libre{-testing,}/libretools --- libre-testing/libretools/PKGBUILD | 91 ----------------------------- libre-testing/libretools/libretools.install | 72 ----------------------- libre/libretools/PKGBUILD | 16 ++--- libre/libretools/libretools.install | 64 ++++++++++++++++---- 4 files changed, 62 insertions(+), 181 deletions(-) delete mode 100644 libre-testing/libretools/PKGBUILD delete mode 100644 libre-testing/libretools/libretools.install (limited to 'libre') diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD deleted file mode 100644 index 51d33f1cd..000000000 --- a/libre-testing/libretools/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Joshua Haase -# Contributor: Márcio Silva - -pkgbase=libretools -pkgname=(libretools libretools-mips64el librelib gitget) -pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/packages/libretools.git/" -license=('GPL3' 'GPL2') - -pkgver=20140120.1 -_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822 -_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd - -_packages_url=https://projects.parabolagnulinux.org/packages -source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 - $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) - -pkgrel=1 -arch=('any') -makedepends=(emacs ronn) # emacs --batch is used during the build to process text -checkdepends=(sh-roundup) - -build() { - cd "$srcdir" - ln -sf devtools-par-$_devtools_commit devtools-par - cd "$srcdir/$pkgbase-$_libretools_commit" - make build-libretools build-libretools-mips64el build-librelib build-doc -} - -check() { - cd "$srcdir/$pkgbase-$_libretools_commit" - - SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo' -} - -package_librelib() { - pkgdesc="Shell library portion of libretools" - depends=( - wget # `aur` and `lib/blacklist.sh` - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-librelib DESTDIR="$pkgdir" -} - -package_gitget() { - depends=("librelib=$pkgver" git) - - provides=("libregit=$pkgver") - conflicts=("libregit") - replaces=("libregit") - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-gitget DESTDIR="$pkgdir" -} - -package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) - install=libretools.install - replaces=(chroottools) - conflicts=(devtools) - - depends=( - "librelib=$pkgver" - "gitget=$pkgver" # `createworkdir` - arch-install-scripts # `archroot` uses `pacstrap` - openssh # `librerelease` - rsync # `librerelease` and `makechrootpkg.sh` - subversion # `diff-unfree` - tokyocabinet # `treepkg` - ) - optdepends=('namcap: to check package files') - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools install-doc DESTDIR="$pkgdir" -} - -package_libretools-mips64el() { - pkgdesc="Scripts for Parabola development (for mips64el architecture)" - depends=("$pkgbase=$pkgver" - git # mips-add - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools-mips64el DESTDIR="$pkgdir" -} - -md5sums=('8991b27aed494b60f33c84dd48aea874' - 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install deleted file mode 100644 index 35edf68c7..000000000 --- a/libre-testing/libretools/libretools.install +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'" -_edit_cmnt='#%s # commented out by the libretools post_install script' - -_add_cmnt='# The following line is added by the libretools post_install script' -_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')' - -# These lines were installed by previous versions of this script -_old_code=( - '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' - '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' - 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")' -) - -# has_line $line -has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } -# add_line $line -add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; } -# del_line $line -del_line() { - local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) - if [[ "${#lineno[@]}" -gt 0 ]]; then - sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf; - fi -} -# rep_line $orig $replacement_bre -rep_line() { - local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) - if [[ "${#lineno[@]}" == 1 ]]; then - sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf; - fi -} - -# arg 1: the new package version -post_install() { - if grep -q 'librefetch' etc/makepkg.conf; then - libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - local line del=false - for line in "${_old_code[@]}"; do - if has_line "$line"; then - pre_remove - post_install - return $? - fi - done - else - libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" - rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" - add_line "$_add_cmnt" - add_line "$_add_code" - fi -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install -} - -pre_remove() { - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - - rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code" - del_line "$_add_cmnt" - del_line "$_add_code" - - local line - for line in "${_old_code[@]}"; do - del_line "$line" - done -} diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 569706f80..51d33f1cd 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Joshua Haase +# Maintainer: Luke Shumaker +# Contributor: Joshua Haase # Contributor: Márcio Silva @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20131112 -_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0 -_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390 +pkgver=20140120.1 +_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822 +_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -64,8 +64,8 @@ package_libretools() { depends=( "librelib=$pkgver" + "gitget=$pkgver" # `createworkdir` arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` @@ -87,5 +87,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('81e6d3d6fe1964a407a4520ce0916c0d' - '656008e8e35e6adba527b7bfc367b9f7') +md5sums=('8991b27aed494b60f33c84dd48aea874' + 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index d46990da8..35edf68c7 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,14 +1,54 @@ #!/bin/sh -_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' +_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'" +_edit_cmnt='#%s # commented out by the libretools post_install script' + +_add_cmnt='# The following line is added by the libretools post_install script' +_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')' + +# These lines were installed by previous versions of this script +_old_code=( + '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' + 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")' +) + +# has_line $line +has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } +# add_line $line +add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; } +# del_line $line +del_line() { + local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) + if [[ "${#lineno[@]}" -gt 0 ]]; then + sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf; + fi +} +# rep_line $orig $replacement_bre +rep_line() { + local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) + if [[ "${#lineno[@]}" == 1 ]]; then + sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf; + fi +} # arg 1: the new package version post_install() { - if grep -q 'libre::' etc/makepkg.conf; then + if grep -q 'librefetch' etc/makepkg.conf; then libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + local line del=false + for line in "${_old_code[@]}"; do + if has_line "$line"; then + pre_remove + post_install + return $? + fi + done else - libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" - printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" + rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" + add_line "$_add_cmnt" + add_line "$_add_code" fi } @@ -19,10 +59,14 @@ post_upgrade() { } pre_remove() { - if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - sed -i '/libre::/d' etc/makepkg.conf - else - libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" - fi + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + + rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code" + del_line "$_add_cmnt" + del_line "$_add_code" + + local line + for line in "${_old_code[@]}"; do + del_line "$line" + done } -- cgit v1.2.3 From 16e1ba06c6d1f0ade84cc9afca0cc54238ade5fd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 22 Jan 2014 00:20:45 -0200 Subject: ogre-libre: add mksource --- libre/ogre-libre/PKGBUILD | 32 +- libre/ogre-libre/libre.patch | 694 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 724 insertions(+), 2 deletions(-) create mode 100644 libre/ogre-libre/libre.patch (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index 57c001e61..9648e5f24 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -43,16 +43,44 @@ makedepends=( mercurial ttf-dejavu ) -source=( +mksource=( ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} + libre.patch ) -sha512sums=( +source=( + https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz +) +mksha512sums=( SKIP + e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767 +) +sha512sums=( + 9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a ) +mksource() { + cd ${pkgbase} + + # remove nonfree files + rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h + rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h + rm -rv Samples/Media/materials/textures/nvidia + rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} + rm -v CMake/Templates/quakemap{,_d}.cfg.in + patch -Np1 -i $srcdir/libre.patch +} + build() { cd ${pkgbase} + # add symlinks to point to mesa header files + cd RenderSystems/GL/include/GL + ln -sv /usr/include/GL/gl.h gl.h + ln -sv /usr/include/GL/glext.h glext.h + ln -sv /usr/include/GL/wglext.h wglext.h + ln -sv /usr/include/GL/glxtokens.h glxtokens.h + ln -sv /usr/include/GL/glxext.h glxext.h + # get a clean build dir [[ -d build ]] && rm -vrf build mkdir -v build && cd build diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch new file mode 100644 index 000000000..77c32c8d4 --- /dev/null +++ b/libre/ogre-libre/libre.patch @@ -0,0 +1,694 @@ +diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake +--- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200 ++++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200 +@@ -116,9 +116,6 @@ + # create plugins.cfg + configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg) +-# create quakemap.cfg +-configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg) +-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg) +@@ -219,11 +216,6 @@ + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg) +- # create quakemap.cfg +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg) +diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in +--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200 ++++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200 +@@ -295,13 +295,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -328,8 +321,6 @@ + + + +- +- + + + +@@ -1338,29 +1329,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1444,12 +1412,6 @@ + + + +- +- +- +- +- +- + + + +@@ -1794,4 +1756,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200 +@@ -555,48 +555,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -3671,15 +3629,6 @@ + false + false + +- +- false +- true +- false +- true +- true +- false +- false +- + + false + true +@@ -4867,20 +4816,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -4893,4 +4828,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-15 01:56:25.872713663 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200 +@@ -628,9 +628,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1075,9 +1072,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1105,12 +1099,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1168,24 +1156,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1492,9 +1468,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1658,4 +1631,4 @@ + Assets\media + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200 +@@ -4356,21 +4356,6 @@ + false + false + +- +- true +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- + + true + false +@@ -6443,96 +6428,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9014,36 +8909,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9264,4 +9129,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-15 01:56:25.899378571 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200 +@@ -731,9 +731,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1154,9 +1151,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1184,12 +1178,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1247,24 +1235,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1571,9 +1547,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1775,4 +1748,4 @@ + Assets\for WMAppManifest + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt +--- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200 ++++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200 +@@ -238,7 +238,6 @@ + set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL}) + set(OGRE_MEDIA_DIR_REL "Media") + configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY) + # restore + set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP}) + add_custom_target(demo_installer +diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h +--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-15 01:56:26.186026332 -0200 ++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200 +@@ -304,17 +304,6 @@ + defaultimp.inputScale = 600; + defaultimp.minBatchSize = 33; + defaultimp.maxBatchSize = 65; +- // textures +- defaultimp.layerList.resize(3); +- defaultimp.layerList[0].worldSize = 100; +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +- defaultimp.layerList[1].worldSize = 30; +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +- defaultimp.layerList[2].worldSize = 200; +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + } + + /*----------------------------------------------------------------------------- +diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material +--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-15 01:56:27.849249967 -0200 ++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200 +@@ -11,36 +11,6 @@ + fragment_program_ref TriplanarReferenceHigh_PS + { + } +- texture_unit +- { +- texture_alias fromX +- texture dirt_grayrocky_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromXNormal +- texture dirt_grayrocky_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromY +- texture grass_green-01_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromYNormal +- texture grass_green-01_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromZ +- texture growth_weirdfungus-03_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromZNormal +- texture growth_weirdfungus-03_normalheight.dds +- } + } + } + } +@@ -57,36 +27,6 @@ + fragment_program_ref TriplanarReferenceLow_PS + { + } +- texture_unit +- { +- texture_alias fromX +- texture dirt_grayrocky_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromXNormal +- texture dirt_grayrocky_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromY +- texture grass_green-01_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromYNormal +- texture grass_green-01_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromZ +- texture growth_weirdfungus-03_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromZNormal +- texture growth_weirdfungus-03_normalheight.dds +- } + } + } + } +@@ -101,4 +41,4 @@ + diffuse 1.0 1.0 1.0 + } + } +-} +\ No newline at end of file ++} +diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h +--- ogre.orig/Samples/Terrain/include/Terrain.h 2014-01-15 01:56:28.209226225 -0200 ++++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200 +@@ -533,17 +533,6 @@ + defaultimp.inputScale = 600; + defaultimp.minBatchSize = 33; + defaultimp.maxBatchSize = 65; +- // textures +- defaultimp.layerList.resize(3); +- defaultimp.layerList[0].worldSize = 100; +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +- defaultimp.layerList[1].worldSize = 30; +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +- defaultimp.layerList[2].worldSize = 200; +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + + + } +diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp +--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200 ++++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200 +@@ -411,16 +411,6 @@ + // mTerrain->update(); + // updateDelay = 0.3; + // } +-// /* +-// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0) +-// { +-// StringVector texNames; +-// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +-// texNames.push_back("growth_weirdfungus-03_normalheight.dds"); +-// mTerrain->addLayer(500, &texNames); +-// updateDelay = 0.3; +-// } +-// */ + // updateDelay -= evt.timeSinceLastFrame; + // } + //#endif +@@ -8185,17 +8175,6 @@ + // imp.inputScale = 600; + // imp.minBatchSize = 33; + // imp.maxBatchSize = 65; +-// // textures +-// imp.layerList.resize(3); +-// imp.layerList[0].worldSize = 100; +-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +-// imp.layerList[1].worldSize = 30; +-// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +-// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +-// imp.layerList[2].worldSize = 200; +-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + // terrain->prepare(imp); + // terrain->load(); + // -- cgit v1.2.3 From aec899a6d3fec98d0a0006235ef05d3e82293eef Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 22 Jan 2014 04:06:38 -0200 Subject: calibre-libre-1.20.0-2: imagemagick 6.8.8.2 rebuild --- libre/calibre-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 0b72e8498..0cd2645cb 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104291 2014-01-17 08:53:47Z jelle $ +# $Id: PKGBUILD 104348 2014-01-18 17:50:29Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -10,7 +10,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=1.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" -- cgit v1.2.3 From e8ad21a51d5e2221e5dad60a0d84abba5089ef5a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 22 Jan 2014 07:03:35 -0200 Subject: calibre-libre-1.20.0-3: fix FS#38611 => https://bugs.archlinux.org/task/38611 --- libre/calibre-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 0cd2645cb..03dd3e20d 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104348 2014-01-18 17:50:29Z jelle $ +# $Id: PKGBUILD 104517 2014-01-22 08:38:23Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -10,7 +10,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=1.20.0 -pkgrel=2 +pkgrel=3 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" -- cgit v1.2.3 From a274bcd3982b28888d7a79624f3c991e65f91071 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 22 Jan 2014 07:04:20 -0200 Subject: xbmc-libre-12.3-8: fix xbmc.install --- libre/xbmc-libre/PKGBUILD | 4 ++-- libre/xbmc-libre/xbmc.install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 7055b9d4f..623914f4e 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104461 2014-01-21 08:35:40Z spupykin $ +# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -11,7 +11,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=7 +pkgrel=8 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 7fc45751a..32626f28f 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -14,5 +14,5 @@ post_upgrade() { post_remove() { [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent passwd xbmc > /dev/null || userdel xbmc + getent passwd xbmc > /dev/null && userdel xbmc } -- cgit v1.2.3 From c87a3442b8df14ac47eedfedf427f37be8f1e9a5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 22 Jan 2014 15:44:14 -0200 Subject: ghostscript-libre-9.10-3: updating revision * go back to bundled heavily patched openjpeg source to solve some segfaults, FS#38226 => https://bugs.archlinux.org/task/38226 * add libpaper support; use gtk3 for gsx --- libre/ghostscript-libre/PKGBUILD | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'libre') diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index d3e1c0724..b16f322f2 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 197986 2013-10-30 12:06:11Z allan $ +# $Id: PKGBUILD 204553 2014-01-22 13:37:42Z andyrtr $ # Maintainer: AndyRTR -# Maintainer (Parabola): Joshua Haase # Maintainer (Parabola): André Silva +# Contributor (Parabola): Joshua Haase ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### _pkgname=ghostscript pkgname=ghostscript-libre pkgver=9.10 -pkgrel=1 +pkgrel=3 pkgdesc="An interpreter for the PostScript language, without nonfree files" arch=('i686' 'x86_64' 'mips64el') license=('AGPL') #non free files removed depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms2' 'dbus') -makedepends=('gtk2' 'gnutls' 'openjpeg') + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls') optdepends=('texlive-core: needed for dvipdf' - 'gtk2: needed for gsx') + 'gtk3: needed for gsx') conflicts=('ghostscript') replaces=('ghostscript') provides=("ghostscript=$pkgver") url="http://www.ghostscript.com/" mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2) -options=('!libtool' '!makeflags') +options=('!makeflags') mkmd5sums=('7179bb1ed4f6f453147e6f7e1f210ce8') md5sums=('c9f6ffec6a07e06caba394d7ebdbbe9a') @@ -37,9 +37,11 @@ mksource() { build() { cd ghostscript-${pkgver} - + # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community ./configure --prefix=/usr \ --enable-dynamic \ @@ -49,12 +51,13 @@ build() { --with-x \ --with-drivers=ALL\ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --with-install-cups \ --enable-fontconfig \ --enable-freetype \ + --enable-openjpeg \ --without-luratech \ --without-omni \ --with-system-libtiff \ + --with-libpaper \ --disable-compile-inits #--help # needed for linking with system-zlib make -- cgit v1.2.3 From 868dad272a6099b9dcdaf0264fffa34e67eeea5c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 22 Jan 2014 16:18:07 -0200 Subject: gnu-ghostscript-9.06.0-7: updating revision * go back to bundled heavily patched openjpeg source to solve some segfaults, FS#38226 => https://bugs.archlinux.org/task/38226 * add libpaper support; use gtk3 for gsx --- libre/gnu-ghostscript/PKGBUILD | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'libre') diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD index f23b29ec0..817e6a418 100644 --- a/libre/gnu-ghostscript/PKGBUILD +++ b/libre/gnu-ghostscript/PKGBUILD @@ -2,25 +2,25 @@ _pkgname=ghostscript pkgname=gnu-ghostscript -_gspkgver=9.10 # ghostscript package version +_gspkgver=9.10 # ghostscript-libre package version _pkgver=9.06 pkgver=9.06.0 -pkgrel=6 +pkgrel=7 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms2' 'dbus') -makedepends=('gtk2' 'gnutls' 'openjpeg') + 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') +makedepends=('gtk3' 'gnutls') optdepends=('texlive-core: needed for dvipdf' - 'gtk2: needed for gsx') + 'gtk3: needed for gsx') conflicts=${_pkgname} provides="${_pkgname}=${_gspkgver}" url="https://www.gnu.org/software/${_pkgname}/" source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz ijs-automake.patch libtool.patch) -options=('!libtool' '!makeflags') +options=('!makeflags') md5sums=('85a5e07a6b91937c157576293b381065' '83bcae456ad4c9fb790be483914dbeba' '5bd5d4966007b460deed866a30a0b3c8') @@ -35,7 +35,9 @@ build() { patch -Np1 -i ${srcdir}/libtool.patch # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community + # keep heavily patched included openjpeg, leads to segfault with system openjpeg + # https://bugs.archlinux.org/task/38226 + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community ./configure --prefix=/usr \ --enable-dynamic \ @@ -45,12 +47,13 @@ build() { --with-x \ --with-drivers=ALL\ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --with-install-cups \ --enable-fontconfig \ --enable-freetype \ + --enable-openjpeg \ --without-luratech \ --without-omni \ --with-system-libtiff \ + --with-libpaper \ --disable-compile-inits #--help # needed for linking with system-zlib make -- cgit v1.2.3 From 4a24a11ddd755ffc0b3ca50f062df536d5f7f152 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 23 Jan 2014 16:40:02 -0200 Subject: gloobus-preview-libre-0.4.5.290-2: port to pygobject3, remove gtk2 dependency --- libre/gloobus-preview-libre/PKGBUILD | 17 ++- ...bus-preview-configuration-pygobject3-port.patch | 124 +++++++++++++++++++++ .../gloobus-sushi-pygobject3-port.patch | 21 ++++ 3 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch create mode 100644 libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch (limited to 'libre') diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD index 5881a4c2e..0a7cf95d5 100644 --- a/libre/gloobus-preview-libre/PKGBUILD +++ b/libre/gloobus-preview-libre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $ +# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $ # Maintainer: Balló György _pkgname=gloobus-preview pkgname=gloobus-preview-libre pkgver=0.4.5.290 _pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support" arch=('i686' 'x86_64') url="http://gloobus.net/" license=('GPL') -depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') +depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils') makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') replaces=$_pkgname conflicts=$_pkgname @@ -25,19 +25,22 @@ optdepends=('djvulibre: Preview DjVu documents' 'unoconv: Preview LibreOffice compatible documents' 'libarchive: View content of RAR archives' 'unzip: View content of .ZIP archives') -options=('!libtool') install=$_pkgname.install source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi fix-gtksource-include.patch fix-unoconv.patch use-xdg-open.patch + gloobus-preview-configuration-pygobject3-port.patch + gloobus-sushi-pygobject3-port.patch gloobus-preview-usr-bsdtar-for-rar.patch) md5sums=('27b3db2043ecaf47fa928940bbb4f32a' 'SKIP' 'ca15a3e31cec01d3d4fc5a4e1720f692' '03379c173e67ad1b6804bc609336451d' 'd6d9e2b3e001f0ea8440cccdf90480af' + '16e7a7d892dfde5fd40332fc41de97b0' + '7536f8fbbb2c6bbc0132a2fa25b296b7' 'eeab61846c861540bb16ca00fa14cdb6') prepare() { @@ -56,6 +59,9 @@ prepare() { # Use xdg-open patch -Np1 -i "$srcdir/use-xdg-open.patch" + # Port gloobus-preview-configuration to pygobject3 + patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch" + # Use bsdtar (libarchive) if unrar is not found. patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch" @@ -64,6 +70,9 @@ prepare() { # Python2 fix sed -i 's/python /python2 /' src/gloobus-sushi.in + + # Port gloobus-sushi to pygobject3 + patch -Np1 -i "$srcdir/gloobus-sushi-pygobject3-port.patch" } diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch new file mode 100644 index 000000000..2c2540753 --- /dev/null +++ b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch @@ -0,0 +1,124 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration 2014-01-22 21:54:41.555697168 +0100 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration 2014-01-22 21:34:36.867164953 +0100 +@@ -6,10 +6,9 @@ + import os + import sys + import glob +-import gtk ++from gi.repository import Gtk, GConf + import signal + import gettext +-import gconf + #import config + + #=========================== CLASS COLORS =======================================================# +@@ -69,54 +68,54 @@ + def __init__(self): + self.config = config_load() + +- self.client = gconf.client_get_default() ++ self.client = GConf.Client.get_default() + self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout') + + #================= Show In Taskbar ================= # +- self.entry1 = gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) ++ self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) + self.entry1.set_tooltip_markup(_("When enabled gloobus-preview will be\nshown in the taskbar")) + self.entry1.set_active(self.config.getboolean("Main","taskbar")) + + #================= Allways on top ================= # +- self.entry2 = gtk.CheckButton(label=_("Always on top"), use_underline=False) ++ self.entry2 = Gtk.CheckButton(label=_("Always on top"), use_underline=False) + self.entry2.set_tooltip_markup(_("When enabled gloobus-preview will be\nalways on top of the other windows")) + self.entry2.set_active(self.config.getboolean("Main","ontop")) + win.set_keep_above(self.config.getboolean("Main","ontop")) + + + #================= Quit on lose focus ================= # +- self.entry3 = gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) ++ self.entry3 = Gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) + self.entry3.set_tooltip_markup(_("When enabled, gloobus-preview will exit\nwhen it loses focus")) + self.entry3.set_active(self.config.getboolean("Main","focus")) + + #================= Win bar layout ================= # +- self.entry4 = gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) ++ self.entry4 = Gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) + self.entry4.set_tooltip_markup(_("Layout of the buttons\nclose button on the right/left?")) + self.entry4.set_active(self.config.getboolean("Main","winbar_layout")) + + #================= Use gtk theme ================= # +- self.theme_gtk_entry = gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) ++ self.theme_gtk_entry = Gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) + self.theme_gtk_entry.set_tooltip_markup(_("When enabled, gloobus-preview will use system GTK theme")) + self.theme_gtk_entry.set_active(self.config.getboolean("Theme","gtk")) + + #=================== BUTTONS ===================== # +- container0 = gtk.HBox(True,1) #Save and close buttons ++ container0 = Gtk.HBox(True,1) #Save and close buttons + +- ok_button = gtk.Button(_("Save")) +- cancel_button = gtk.Button(_("Cancel")) ++ ok_button = Gtk.Button(_("Save")) ++ cancel_button = Gtk.Button(_("Cancel")) + + container0.add(cancel_button) + container0.add(ok_button) +- cancel_button.connect('clicked', gtk.main_quit) ++ cancel_button.connect('clicked', Gtk.main_quit) + ok_button.connect('clicked', self.save_conf) + + #============ GENERAL CONTAINER ================== # + +- general_container = gtk.VBox(False,1) ++ general_container = Gtk.VBox(False,1) + +- title = gtk.Label() ++ title = Gtk.Label() + title.set_markup(_("Main settings")) +- align2 = gtk.Alignment(0,0,0,0) ++ align2 = Gtk.Alignment.new(0,0,0,0) + align2.set_padding(0,5,0,0) + align2.add(title) + +@@ -128,11 +127,11 @@ + if self.gconf_win_layout == None: + general_container.add(self.entry4) #Always on top + +- general_container.add(gtk.HSeparator()) +- general_container.add(gtk.Label()) #White Space ++ general_container.add(Gtk.HSeparator()) ++ general_container.add(Gtk.Label()) #White Space + general_container.add(container0) #Close & save buttons + +- align = gtk.Alignment(0,0,0,0); ++ align = Gtk.Alignment.new(0,0,0,0); + align.set_padding(10,5,10,10) + + align.add(general_container) +@@ -155,7 +154,7 @@ + + config_save(self.config) + +- gtk.main_quit() ++ Gtk.main_quit() + + + #==================================== GLOBAL FUNCTIONS ===============================================# +@@ -232,13 +231,13 @@ + g.debug("Path: " + abspath) + g.debug("Config File: " + CONFIG_PATH) + +-win = gtk.Window() ++win = Gtk.Window() + win.set_title(_("Gloobus-Preview Configuration")) + #win.set_default_size(400,150) +-win.connect('delete-event', gtk.main_quit) ++win.connect('delete-event', Gtk.main_quit) + + + gui = GUI() + +-gtk.main() ++Gtk.main() + diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch new file mode 100644 index 000000000..f748da875 --- /dev/null +++ b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch @@ -0,0 +1,21 @@ +diff -Naur gloobus-sushi.orig/src/gloobus-sushi.py gloobus-sushi/src/gloobus-sushi.py +--- gloobus-sushi.orig/src/gloobus-sushi.py 2014-01-22 21:54:41.297590000 +0100 ++++ gloobus-sushi/src/gloobus-sushi.py 2014-01-22 21:45:21.244184455 +0100 +@@ -16,7 +16,7 @@ + + import dbus + import dbus.service +-import gobject ++from gi.repository import GObject + import os + + from dbus.mainloop.glib import DBusGMainLoop +@@ -28,7 +28,7 @@ + def __init__(self): + bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus()) + super(DBusWrapper, self).__init__(bus_name, DBUS_PATH) +- self.loop = gobject.MainLoop() ++ self.loop = GObject.MainLoop() + self.loop.run() + + @dbus.service.method(DBUS_NAME) -- cgit v1.2.3 From dbe94786e7d2d38306b329e486a9e743c6ebf296 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 24 Jan 2014 11:35:07 -0200 Subject: xarchiver-libre-0.5.2-6: add some more important fixes for xarchiver --- libre/xarchiver-libre/PKGBUILD | 115 ++++-- libre/xarchiver-libre/rePKGBUILD | 26 -- .../xarchiver-0.5.2-add-unar-support.patch | 354 ++++++++++++++++++ .../xarchiver-0.5.2-add_mime_types.patch | 9 + .../xarchiver-0.5.2-add_unar_support.patch | 354 ++++++++++++++++++ .../xarchiver-0.5.2-add_xz_support.patch | 397 +++++++++++++++++++++ .../xarchiver-0.5.2-drag-n-drop_escaped_path.patch | 13 + .../xarchiver-0.5.2-fix-double-escaping.patch | 32 ++ .../xarchiver-0.5.2-fix-non-existent-archive.patch | 26 ++ .../xarchiver-0.5.2-no-donators-menu.patch | 50 +++ .../xarchiver-0.5.2-segfault-delete-file.patch | 21 ++ ...rchiver-0.5.2-segfault-password-protected.patch | 43 +++ 12 files changed, 1377 insertions(+), 63 deletions(-) delete mode 100644 libre/xarchiver-libre/rePKGBUILD create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch create mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch (limited to 'libre') diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 9c0c0729c..df6bfbca6 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -1,64 +1,105 @@ -# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $ -# Maintainer: Alexander Fehr +# $Id: PKGBUILD 104651 2014-01-24 08:23:36Z bgyorgy $ +# Maintainer: Balló György +# Contributor: Alexander Fehr # Contributor: Andrew Simmons +# Maintainer (Parabola): André Silva _pkgname=xarchiver pkgname=xarchiver-libre pkgver=0.5.2 -pkgrel=5.1 -pkgdesc="GTK+ frontend to various command line archivers" -arch=('i686' 'x86_64') -url="http://xarchiver.sourceforge.net" +pkgrel=6 +pkgdesc="GTK+ frontend to various command line archivers, with unar support" +arch=('i686' 'x86_64' 'mips64el') +url="http://xarchiver.sourceforge.net/" license=('GPL') -groups=('xfce4-goodies') -depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool') provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") -replacesk=("$_pkgname") -optdepends=('tar: TAR support' - 'gzip: GZIP support' - 'bzip2: BZIP2 support' - 'zip: ZIP support' +replaces=("$_pkgname") +depends=('gtk2' 'desktop-file-utils') +makedepends=('intltool') +optdepends=('zip: ZIP support' 'unzip: ZIP support' 'unar: RAR support' 'p7zip: 7z support' 'arj: ARJ support' - 'lha: LHA support' - 'xz: LZMA support' - 'lzop: LZOP support') -options=('!libtool') + 'lzop: LZOP support' + 'cpio: RPM support') install=xarchiver.install source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2 - # rpm2cpio.patch by Daniel Hokka Zakrisson - # taken from https://bugzilla.redhat.com/show_bug.cgi?id=577480 - # sent upstream through - # https://sourceforge.net/tracker/?func=detail&aid=3310768&group_id=140153&atid=745602 - xarchiver-0.5.2-rpm2cpio.patch - # segfault-open-with.patch by Bastiaan Jacques - # taken from https://bugzilla.redhat.com/show_bug.cgi?id=690012 - # sent upstream through - # https://sourceforge.net/tracker/?func=detail&aid=3310778&group_id=140153&atid=745600 + xarchiver-0.5.2-no-donators-menu.patch + xarchiver-0.5.2-add_xz_support.patch xarchiver-0.5.2-segfault-open-with.patch - # fix-7z-support.patch by taken from - # https://sourceforge.net/tracker/?func=detail&aid=3137589&group_id=140153&atid=745602 - xarchiver-0.5.2-fix_7z_support.patch) + xarchiver-0.5.2-fix_7z_support.patch + xarchiver-0.5.2-drag-n-drop_escaped_path.patch + xarchiver-0.5.2-fix-double-escaping.patch + xarchiver-0.5.2-fix-non-existent-archive.patch + xarchiver-0.5.2-segfault-delete-file.patch + xarchiver-0.5.2-segfault-password-protected.patch + xarchiver-0.5.2-add_unar_support.patch + xarchiver-0.5.2-add_mime_types.patch) md5sums=('2bc7f06403cc6582dd4a8029ec9d038d' - 'd4a1accdbba2b50e5707097dd3548d7a' + '7ef9fe9aee9f0fbc141ed9683e91ea1c' + '5d5ef8dd1b8b7790af4ece5fcedcd370' 'f9036a44157b318cbc59ed012b04974b' - '782f55c1f1021dc02c7739bf8a47336e') + '782f55c1f1021dc02c7739bf8a47336e' + 'fcd9e04222c5e0ef459977bd7cd0ae4e' + '6178d7ab679b761469c880a8db991907' + '22ed2783e72684a102243c5834bf5ca3' + 'e518b1e0bc4407383aae2783c0c19a04' + 'c46daf2ee9fce7ece608eca33174db6b' + '13c133a6ba867425b9a8a13900664d18' + '36a4c3181230aab1e0ce1596acc5ef88') -build() { - cd "$srcdir/xarchiver-$pkgver" - #patches taken from: http://pkgs.fedoraproject.org/gitweb/?p=xarchiver.git - patch -Np1 -i ../xarchiver-0.5.2-rpm2cpio.patch +prepare() { + cd $_pkgname-$pkgver + + # Fix donators menu item (upstream patch) + patch -Np2 -i ../xarchiver-0.5.2-no-donators-menu.patch + + # Add XZ support + # http://sourceforge.net/p/xarchiver/bugs/28/ + patch -Np1 -i ../xarchiver-0.5.2-add_xz_support.patch + + # Fix segfault on open with dialog + # http://sourceforge.net/p/xarchiver/bugs/52/ patch -Np1 -i ../xarchiver-0.5.2-segfault-open-with.patch + + # Fix 7z support + # http://sourceforge.net/p/xarchiver/patches/5/ patch -Np1 -i ../xarchiver-0.5.2-fix_7z_support.patch + + # Fix extraction when the Drag'n'Drop target path contains spaces + patch -Np1 -i ../xarchiver-0.5.2-drag-n-drop_escaped_path.patch + + # Fix error when trying to create archives with spaces + patch -Np1 -i ../xarchiver-0.5.2-fix-double-escaping.patch + + # Fix segfault when non-existent archive specified + patch -Np1 -i ../xarchiver-0.5.2-fix-non-existent-archive.patch + + # Fix segfault when deleting a file + patch -Np1 -i ../xarchiver-0.5.2-segfault-delete-file.patch + + # Fix segfault when handling password protected files + patch -Np1 -i ../xarchiver-0.5.2-segfault-password-protected.patch + + # Add unar support + patch -Np1 -i ../xarchiver-0.5.2-add_unar_support.patch + + # Add more MIME types in the desktop file + patch -Np1 -i ../xarchiver-0.5.2-add_mime_types.patch + + # Update upstream URL + find -type f | xargs sed -i 's|http://xarchiver.xfce.org|http://xarchiver.sf.net|' +} + +build() { + cd $_pkgname-$pkgver ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 make } package() { - cd "$srcdir/xarchiver-$pkgver" + cd $_pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/libre/xarchiver-libre/rePKGBUILD b/libre/xarchiver-libre/rePKGBUILD deleted file mode 100644 index 7f435d23f..000000000 --- a/libre/xarchiver-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Nicolás Reynolds -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -_repo=extra # Put the repo here -_mirror=ftp://ftp.archlinux.org # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm -vf ./.{INSTALL,PKGINFO} - # put actions for package modifications below this line - -} - -package() { - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch new file mode 100644 index 000000000..25c1d66ab --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch @@ -0,0 +1,354 @@ +diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch03s03.html +--- xarchiver-0.5.2.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 ++++ xarchiver-0.5.2/doc/html/ch03s03.html 2014-01-24 11:26:24.869538956 -0200 +@@ -1,7 +1,7 @@ + + + General
General
Prev Chapter 3. Usage Next

General

Startup

+- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. ++ At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created. +

How it works

+ Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script xdg-open will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it. +

Drag and Drop

+diff -Nur xarchiver-0.5.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiver.docbook +--- xarchiver-0.5.2.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 ++++ xarchiver-0.5.2/doc/xarchiver.docbook 2014-01-24 11:25:23.413824351 -0200 +@@ -204,7 +204,7 @@ +

+ Startup + +- At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. ++ At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened and extracted but not to be created. + +
+
+diff -Nur xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c +--- xarchiver-0.5.2.orig/src/extract_dialog.c 2008-11-10 08:28:11.000000000 -0200 ++++ xarchiver-0.5.2/src/extract_dialog.c 2014-01-24 10:55:28.209263885 -0200 +@@ -24,7 +24,7 @@ + #include "string_utils.h" + #include "support.h" + +-extern gboolean unrar,batch_mode; ++extern gboolean unar,batch_mode; + extern Prefs_dialog_data *prefs_window; + extern Progress_bar_data *pb; + extern extract_func extract [XARCHIVETYPE_COUNT]; +@@ -290,11 +290,7 @@ + GSList *names = NULL; + GtkTreeModel *model; + int response; +- +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ rar = "unar"; + + while (! done) + { +diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c +--- xarchiver-0.5.2.orig/src/interface.c 2008-11-11 06:09:01.000000000 -0200 ++++ xarchiver-0.5.2/src/interface.c 2014-01-24 10:56:03.893317117 -0200 +@@ -45,7 +45,7 @@ + { "text/uri-list",0,0 }, + }; + +-extern gboolean unrar,batch_mode; ++extern gboolean unar,batch_mode; + + static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); + static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); +@@ -629,7 +629,7 @@ + { + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); +- if (archive[id]->type == XARCHIVETYPE_RAR && unrar) ++ if (archive[id]->type == XARCHIVETYPE_RAR && unar) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c +--- xarchiver-0.5.2.orig/src/main.c 2008-11-10 09:21:43.000000000 -0200 ++++ xarchiver-0.5.2/src/main.c 2014-01-24 10:59:39.108832843 -0200 +@@ -33,7 +33,7 @@ + gchar *add_files; + gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; + gboolean batch_mode = FALSE; +-gboolean unrar = FALSE; ++gboolean unar = FALSE; + gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; + int response; + extern gchar *current_open_directory; +@@ -410,24 +410,14 @@ + //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); + } + +- absolute_path = g_find_program_in_path ("rar"); +- if ( absolute_path ) ++ absolute_path = g_find_program_in_path("unar"); ++ if ( absolute_path ) + { ++ unar = TRUE; + ArchiveType = g_list_append(ArchiveType, "rar"); + ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); + g_free (absolute_path); + } +- else +- { +- absolute_path = g_find_program_in_path("unrar"); +- if ( absolute_path ) +- { +- unrar = TRUE; +- ArchiveType = g_list_append(ArchiveType, "rar"); +- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); +- g_free (absolute_path); +- } +- } + + absolute_path = g_find_program_in_path("cpio"); + if ( absolute_path ) +diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c +--- xarchiver-0.5.2.orig/src/new_dialog.c 2008-11-11 06:28:46.000000000 -0200 ++++ xarchiver-0.5.2/src/new_dialog.c 2014-01-24 10:56:34.274491565 -0200 +@@ -24,7 +24,7 @@ + #include "string_utils.h" + #include "main.h" + +-extern gboolean unrar; ++extern gboolean unar; + extern Prefs_dialog_data *prefs_window; + gchar *current_new_directory = NULL; + gint new_combo_box = -1; +diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog.c +--- xarchiver-0.5.2.orig/src/pref_dialog.c 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.2/src/pref_dialog.c 2014-01-24 10:54:07.611853842 -0200 +@@ -23,7 +23,7 @@ + #include "main.h" + #include "support.h" + +-extern gboolean unrar; ++extern gboolean unar; + extern gboolean xdg_open; + extern Extract_dialog_data *extract_window; + extern Add_dialog_data *add_window; +@@ -104,7 +104,7 @@ + { + if (strcmp(archive_type->data, "tgz") == 0 || + strcmp(archive_type->data, "rpm") == 0 || +- (strcmp(archive_type->data, "rar") == 0 && unrar) ) ++ (strcmp(archive_type->data, "rar") == 0 && unar) ) + goto next; + else + gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); +diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c +--- xarchiver-0.5.2.orig/src/rar.c 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.2/src/rar.c 2014-01-24 10:50:11.672526720 -0200 +@@ -20,7 +20,7 @@ + #include "rar.h" + #include + +-extern gboolean unrar; ++extern gboolean unar; + extern void xa_reload_archive_content(XArchive *archive); + extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]); + +@@ -30,19 +30,10 @@ + gchar *command = NULL; + gchar *rar = NULL; + jump_header = read_filename = last_line = encrypted = FALSE; ++ rar = "unar"; ++ archive->can_add = archive->has_sfx = FALSE; + +- if (unrar) +- { +- rar = "unrar"; +- archive->can_add = archive->has_sfx = FALSE; +- } +- else +- { +- rar = "rar"; +- archive->can_add = archive->has_sfx = TRUE; +- } +- +- command = g_strconcat ( rar," v " , archive->escaped_path, NULL ); ++ command = g_strconcat ( rar, archive->escaped_path, NULL ); + archive->can_extract = archive->has_test = archive->has_properties = TRUE; + archive->dummy_size = 0; + archive->nr_of_files = 0; +@@ -222,71 +213,6 @@ + } + } + +-void xa_rar_delete (XArchive *archive,GSList *names) +-{ +- gchar *command,*e_filename = NULL; +- GSList *list = NULL,*_names; +- GString *files = g_string_new(""); +- +- _names = names; +- while (_names) +- { +- e_filename = xa_escape_filename((gchar*)_names->data,"$'`\"\\!?* ()[]&|:;<>#"); +- g_string_prepend (files,e_filename); +- g_string_prepend_c (files,' '); +- _names = _names->next; +- } +- g_slist_foreach(names,(GFunc)g_free,NULL); +- g_slist_free(names); +- +- command = g_strconcat ("rar d ",archive->escaped_path," ",files->str,NULL); +- g_string_free(files,TRUE); +- list = g_slist_append(list,command); +- +- xa_run_command (archive,list); +- if (archive->status == XA_ARCHIVESTATUS_DELETE) +- xa_reload_archive_content(archive); +-} +- +-void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string) +-{ +- GSList *list = NULL; +- gchar *command = NULL; +- +- if (archive->location_entry_path != NULL) +- archive->working_dir = g_strdup(archive->tmp); +- +- if (compression_string == NULL) +- compression_string = "3"; +- if (archive->passwd != NULL) +- command = g_strconcat ( "rar a ", +- archive->update ? "-u " : "", +- archive->freshen ? "-f " : "", +- archive->solid_archive ? "-s " : "", +- archive->remove_files ? "-df " : "", +- "-p" , archive->passwd, +- " -idp ", +- "-m",compression_string," ", +- archive->escaped_path, +- files->str,NULL); +- else +- command = g_strconcat ( "rar a ", +- archive->update ? "-u " : "", +- archive->freshen ? "-f " : "", +- archive->solid_archive ? "-s " : " ", +- archive->remove_files ? "-df " : " ", +- "-idp ", +- "-m",compression_string," ", +- archive->escaped_path, +- files->str,NULL); +- +- g_string_free(files,TRUE); +- list = g_slist_append(list,command); +- +- xa_run_command (archive,list); +- xa_reload_archive_content(archive); +-} +- + gboolean xa_rar_extract(XArchive *archive,GSList *files) + { + gchar *rar, *command, *e_filename = NULL; +@@ -295,10 +221,8 @@ + gboolean result = FALSE; + + _files = files; +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ (unar) ++ rar = "unar"; + + while (_files) + { +@@ -311,17 +235,13 @@ + g_slist_free(_files); + + if (archive->passwd != NULL) +- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", +- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", ++ command = g_strconcat (rar," ",archive->full_path ? "-q ", + " -p",archive->passwd, +- archive->overwrite ? " -o+" : " -o-", +- " -idp ", ++ archive->overwrite ? " -f", + archive->escaped_path,names->str," ",archive->extraction_path , NULL ); + else +- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", +- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", +- archive->overwrite ? "-o+" : "-o-", +- " -idp ", ++ command = g_strconcat (rar," ",archive->full_path ? "-q ", ++ archive->overwrite ? " -f", + archive->escaped_path,names->str," ",archive->extraction_path , NULL ); + g_string_free(names,TRUE); + list = g_slist_append(list,command); +@@ -329,24 +249,3 @@ + result = xa_run_command (archive,list); + return result; + } +- +-void xa_rar_test (XArchive *archive) +-{ +- gchar *rar = NULL; +- gchar *command = NULL; +- GSList *list = NULL; +- +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; +- +- archive->status = XA_ARCHIVESTATUS_TEST; +- if (archive->passwd != NULL) +- command = g_strconcat (rar," t -idp -p" , archive->passwd ," " , archive->escaped_path, NULL); +- else +- command = g_strconcat (rar," t -idp " , archive->escaped_path, NULL); +- +- list = g_slist_append(list,command); +- xa_run_command (archive,list); +- } +diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h +--- xarchiver-0.5.2.orig/src/rar.h 2008-08-22 05:12:38.000000000 -0300 ++++ xarchiver-0.5.2/src/rar.h 2014-01-24 10:49:13.140141939 -0200 +@@ -26,10 +26,7 @@ + #include "support.h" + #include "archive.h" + gboolean jump_header,jump_comment,read_filename, last_line, encrypted; +-void xa_rar_delete (XArchive *,GSList *); +-void xa_rar_add (XArchive *,GString *,gchar *); + gboolean xa_rar_extract(XArchive *,GSList *); +-void xa_rar_test (XArchive *); + void xa_get_rar_line_content (gchar *line, gpointer data); + void xa_open_rar ( XArchive *archive ); + #endif +diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2008-11-11 06:31:45.000000000 -0200 ++++ xarchiver-0.5.2/src/window.c 2014-01-24 10:54:28.673636196 -0200 +@@ -26,7 +26,7 @@ + + extern GList *ArchiveType; + extern GList *ArchiveSuffix; +-extern gboolean unrar; ++extern gboolean unar; + extern gboolean xdg_open; + extern Prefs_dialog_data *prefs_window; + extern Extract_dialog_data *extract_window; +@@ -1567,7 +1567,7 @@ + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); + } +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) ++ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +@@ -1781,7 +1781,7 @@ + else + idx = xa_find_archive_index (current_page); + +- if (archive[idx]->type == XARCHIVETYPE_RAR && unrar) ++ if (archive[idx]->type == XARCHIVETYPE_RAR && unar) + { + response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); + return; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch new file mode 100644 index 000000000..3b510fcb8 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_mime_types.patch @@ -0,0 +1,9 @@ +diff -Naur xarchiver-0.5.2.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in +--- xarchiver-0.5.2.orig/xarchiver.desktop.in 2014-01-24 04:05:33.438561000 +0100 ++++ xarchiver-0.5.2/xarchiver.desktop.in 2014-01-24 04:44:00.625750394 +0100 +@@ -11,4 +11,4 @@ + X-MultipleArgs=false + Categories=GTK;Archiving;Utility; + StartupNotify=true +-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar; ++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch new file mode 100644 index 000000000..457fe80e5 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch @@ -0,0 +1,354 @@ +diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch03s03.html +--- xarchiver-0.5.2.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 ++++ xarchiver-0.5.2/doc/html/ch03s03.html 2014-01-24 11:02:20.640986656 -0200 +@@ -1,7 +1,7 @@ + + + General
General
Prev Chapter 3. Usage Next

General

Startup

+- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. ++ At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created. +

How it works

+ Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script xdg-open will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it. +

Drag and Drop

+diff -Nur xarchiver-0.5.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiver.docbook +--- xarchiver-0.5.2.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 ++++ xarchiver-0.5.2/doc/xarchiver.docbook 2014-01-24 11:01:17.088748863 -0200 +@@ -204,7 +204,7 @@ +

+ Startup + +- At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. ++ At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened and extracted but not to be created. + +
+
+diff -Nur xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c +--- xarchiver-0.5.2.orig/src/extract_dialog.c 2008-11-10 08:28:11.000000000 -0200 ++++ xarchiver-0.5.2/src/extract_dialog.c 2014-01-24 10:55:28.209263885 -0200 +@@ -24,7 +24,7 @@ + #include "string_utils.h" + #include "support.h" + +-extern gboolean unrar,batch_mode; ++extern gboolean unar,batch_mode; + extern Prefs_dialog_data *prefs_window; + extern Progress_bar_data *pb; + extern extract_func extract [XARCHIVETYPE_COUNT]; +@@ -290,11 +290,7 @@ + GSList *names = NULL; + GtkTreeModel *model; + int response; +- +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ rar = "unar"; + + while (! done) + { +diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c +--- xarchiver-0.5.2.orig/src/interface.c 2008-11-11 06:09:01.000000000 -0200 ++++ xarchiver-0.5.2/src/interface.c 2014-01-24 10:56:03.893317117 -0200 +@@ -45,7 +45,7 @@ + { "text/uri-list",0,0 }, + }; + +-extern gboolean unrar,batch_mode; ++extern gboolean unar,batch_mode; + + static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); + static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); +@@ -629,7 +629,7 @@ + { + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); +- if (archive[id]->type == XARCHIVETYPE_RAR && unrar) ++ if (archive[id]->type == XARCHIVETYPE_RAR && unar) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c +--- xarchiver-0.5.2.orig/src/main.c 2008-11-10 09:21:43.000000000 -0200 ++++ xarchiver-0.5.2/src/main.c 2014-01-24 10:59:39.108832843 -0200 +@@ -33,7 +33,7 @@ + gchar *add_files; + gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; + gboolean batch_mode = FALSE; +-gboolean unrar = FALSE; ++gboolean unar = FALSE; + gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; + int response; + extern gchar *current_open_directory; +@@ -410,24 +410,14 @@ + //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); + } + +- absolute_path = g_find_program_in_path ("rar"); +- if ( absolute_path ) ++ absolute_path = g_find_program_in_path("unar"); ++ if ( absolute_path ) + { ++ unar = TRUE; + ArchiveType = g_list_append(ArchiveType, "rar"); + ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); + g_free (absolute_path); + } +- else +- { +- absolute_path = g_find_program_in_path("unrar"); +- if ( absolute_path ) +- { +- unrar = TRUE; +- ArchiveType = g_list_append(ArchiveType, "rar"); +- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); +- g_free (absolute_path); +- } +- } + + absolute_path = g_find_program_in_path("cpio"); + if ( absolute_path ) +diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c +--- xarchiver-0.5.2.orig/src/new_dialog.c 2008-11-11 06:28:46.000000000 -0200 ++++ xarchiver-0.5.2/src/new_dialog.c 2014-01-24 10:56:34.274491565 -0200 +@@ -24,7 +24,7 @@ + #include "string_utils.h" + #include "main.h" + +-extern gboolean unrar; ++extern gboolean unar; + extern Prefs_dialog_data *prefs_window; + gchar *current_new_directory = NULL; + gint new_combo_box = -1; +diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog.c +--- xarchiver-0.5.2.orig/src/pref_dialog.c 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.2/src/pref_dialog.c 2014-01-24 10:54:07.611853842 -0200 +@@ -23,7 +23,7 @@ + #include "main.h" + #include "support.h" + +-extern gboolean unrar; ++extern gboolean unar; + extern gboolean xdg_open; + extern Extract_dialog_data *extract_window; + extern Add_dialog_data *add_window; +@@ -104,7 +104,7 @@ + { + if (strcmp(archive_type->data, "tgz") == 0 || + strcmp(archive_type->data, "rpm") == 0 || +- (strcmp(archive_type->data, "rar") == 0 && unrar) ) ++ (strcmp(archive_type->data, "rar") == 0 && unar) ) + goto next; + else + gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); +diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c +--- xarchiver-0.5.2.orig/src/rar.c 2008-11-10 06:05:07.000000000 -0200 ++++ xarchiver-0.5.2/src/rar.c 2014-01-24 10:50:11.672526720 -0200 +@@ -20,7 +20,7 @@ + #include "rar.h" + #include + +-extern gboolean unrar; ++extern gboolean unar; + extern void xa_reload_archive_content(XArchive *archive); + extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]); + +@@ -30,19 +30,10 @@ + gchar *command = NULL; + gchar *rar = NULL; + jump_header = read_filename = last_line = encrypted = FALSE; ++ rar = "unar"; ++ archive->can_add = archive->has_sfx = FALSE; + +- if (unrar) +- { +- rar = "unrar"; +- archive->can_add = archive->has_sfx = FALSE; +- } +- else +- { +- rar = "rar"; +- archive->can_add = archive->has_sfx = TRUE; +- } +- +- command = g_strconcat ( rar," v " , archive->escaped_path, NULL ); ++ command = g_strconcat ( rar, archive->escaped_path, NULL ); + archive->can_extract = archive->has_test = archive->has_properties = TRUE; + archive->dummy_size = 0; + archive->nr_of_files = 0; +@@ -222,71 +213,6 @@ + } + } + +-void xa_rar_delete (XArchive *archive,GSList *names) +-{ +- gchar *command,*e_filename = NULL; +- GSList *list = NULL,*_names; +- GString *files = g_string_new(""); +- +- _names = names; +- while (_names) +- { +- e_filename = xa_escape_filename((gchar*)_names->data,"$'`\"\\!?* ()[]&|:;<>#"); +- g_string_prepend (files,e_filename); +- g_string_prepend_c (files,' '); +- _names = _names->next; +- } +- g_slist_foreach(names,(GFunc)g_free,NULL); +- g_slist_free(names); +- +- command = g_strconcat ("rar d ",archive->escaped_path," ",files->str,NULL); +- g_string_free(files,TRUE); +- list = g_slist_append(list,command); +- +- xa_run_command (archive,list); +- if (archive->status == XA_ARCHIVESTATUS_DELETE) +- xa_reload_archive_content(archive); +-} +- +-void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string) +-{ +- GSList *list = NULL; +- gchar *command = NULL; +- +- if (archive->location_entry_path != NULL) +- archive->working_dir = g_strdup(archive->tmp); +- +- if (compression_string == NULL) +- compression_string = "3"; +- if (archive->passwd != NULL) +- command = g_strconcat ( "rar a ", +- archive->update ? "-u " : "", +- archive->freshen ? "-f " : "", +- archive->solid_archive ? "-s " : "", +- archive->remove_files ? "-df " : "", +- "-p" , archive->passwd, +- " -idp ", +- "-m",compression_string," ", +- archive->escaped_path, +- files->str,NULL); +- else +- command = g_strconcat ( "rar a ", +- archive->update ? "-u " : "", +- archive->freshen ? "-f " : "", +- archive->solid_archive ? "-s " : " ", +- archive->remove_files ? "-df " : " ", +- "-idp ", +- "-m",compression_string," ", +- archive->escaped_path, +- files->str,NULL); +- +- g_string_free(files,TRUE); +- list = g_slist_append(list,command); +- +- xa_run_command (archive,list); +- xa_reload_archive_content(archive); +-} +- + gboolean xa_rar_extract(XArchive *archive,GSList *files) + { + gchar *rar, *command, *e_filename = NULL; +@@ -295,10 +221,8 @@ + gboolean result = FALSE; + + _files = files; +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; ++ (unar) ++ rar = "unar"; + + while (_files) + { +@@ -311,17 +235,13 @@ + g_slist_free(_files); + + if (archive->passwd != NULL) +- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", +- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", ++ command = g_strconcat (rar," ",archive->full_path ? "-q ", + " -p",archive->passwd, +- archive->overwrite ? " -o+" : " -o-", +- " -idp ", ++ archive->overwrite ? " -f", + archive->escaped_path,names->str," ",archive->extraction_path , NULL ); + else +- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", +- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", +- archive->overwrite ? "-o+" : "-o-", +- " -idp ", ++ command = g_strconcat (rar," ",archive->full_path ? "-q ", ++ archive->overwrite ? " -f", + archive->escaped_path,names->str," ",archive->extraction_path , NULL ); + g_string_free(names,TRUE); + list = g_slist_append(list,command); +@@ -329,24 +249,3 @@ + result = xa_run_command (archive,list); + return result; + } +- +-void xa_rar_test (XArchive *archive) +-{ +- gchar *rar = NULL; +- gchar *command = NULL; +- GSList *list = NULL; +- +- if (unrar) +- rar = "unrar"; +- else +- rar = "rar"; +- +- archive->status = XA_ARCHIVESTATUS_TEST; +- if (archive->passwd != NULL) +- command = g_strconcat (rar," t -idp -p" , archive->passwd ," " , archive->escaped_path, NULL); +- else +- command = g_strconcat (rar," t -idp " , archive->escaped_path, NULL); +- +- list = g_slist_append(list,command); +- xa_run_command (archive,list); +- } +diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h +--- xarchiver-0.5.2.orig/src/rar.h 2008-08-22 05:12:38.000000000 -0300 ++++ xarchiver-0.5.2/src/rar.h 2014-01-24 10:49:13.140141939 -0200 +@@ -26,10 +26,7 @@ + #include "support.h" + #include "archive.h" + gboolean jump_header,jump_comment,read_filename, last_line, encrypted; +-void xa_rar_delete (XArchive *,GSList *); +-void xa_rar_add (XArchive *,GString *,gchar *); + gboolean xa_rar_extract(XArchive *,GSList *); +-void xa_rar_test (XArchive *); + void xa_get_rar_line_content (gchar *line, gpointer data); + void xa_open_rar ( XArchive *archive ); + #endif +diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2008-11-11 06:31:45.000000000 -0200 ++++ xarchiver-0.5.2/src/window.c 2014-01-24 10:54:28.673636196 -0200 +@@ -26,7 +26,7 @@ + + extern GList *ArchiveType; + extern GList *ArchiveSuffix; +-extern gboolean unrar; ++extern gboolean unar; + extern gboolean xdg_open; + extern Prefs_dialog_data *prefs_window; + extern Extract_dialog_data *extract_window; +@@ -1567,7 +1567,7 @@ + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); + } +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) ++ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +@@ -1781,7 +1781,7 @@ + else + idx = xa_find_archive_index (current_page); + +- if (archive[idx]->type == XARCHIVETYPE_RAR && unrar) ++ if (archive[idx]->type == XARCHIVETYPE_RAR && unar) + { + response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); + return; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch new file mode 100644 index 000000000..d246a8e19 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_xz_support.patch @@ -0,0 +1,397 @@ +diff -uNr xarchiver-0.5.2.orig/src/add_dialog.c xarchiver-0.5.2/src/add_dialog.c +--- xarchiver-0.5.2.orig/src/add_dialog.c 2008-11-10 19:41:31.000000000 +0900 ++++ xarchiver-0.5.2/src/add_dialog.c 2013-05-11 10:01:47.887094708 +0900 +@@ -209,7 +209,7 @@ + else + gtk_widget_set_size_request (add_dialog->dialog1,530,420); + +- if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_LZOP) ++ if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),FALSE); + else + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(add_dialog->filechooserwidget1),TRUE); +@@ -222,7 +222,7 @@ + else + gtk_widget_set_sensitive(add_dialog->store_path,TRUE); + /* 7z doesn't appear to let the user chooses if storing full paths */ +- if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA) ++ if (archive->type == XARCHIVETYPE_7ZIP || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ ) + { + flag = FALSE; + } +@@ -244,7 +244,7 @@ + flag = TRUE; + gtk_widget_set_sensitive(add_dialog->solid_archive,flag); + +- if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP) ++ if (archive->type != XARCHIVETYPE_TAR && archive->type != XARCHIVETYPE_TAR_GZ && archive->type != XARCHIVETYPE_TAR_LZMA && archive->type != XARCHIVETYPE_TAR_XZ && archive->type != XARCHIVETYPE_TAR_BZ2 && archive->type != XARCHIVETYPE_TAR_LZOP) + { + flag = TRUE; + if (archive->type == XARCHIVETYPE_7ZIP) +@@ -306,7 +306,7 @@ + g_signal_connect (G_OBJECT (add_dialog->compression_value),"value-changed",G_CALLBACK (fix_adjustment_value), NULL); + gtk_tooltips_set_tip (add_dialog->option_tooltip,add_dialog->compression_scale, compression_msg, NULL ); + +- if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP) ++ if (archive->type == XARCHIVETYPE_TAR || archive->type == XARCHIVETYPE_TAR_GZ || archive->type == XARCHIVETYPE_TAR_LZMA || archive->type == XARCHIVETYPE_TAR_XZ || archive->type == XARCHIVETYPE_TAR_BZ2 || archive->type == XARCHIVETYPE_TAR_LZOP) + flag = FALSE; + else + flag = TRUE; +diff -uNr xarchiver-0.5.2.orig/src/archive.h xarchiver-0.5.2/src/archive.h +--- xarchiver-0.5.2.orig/src/archive.h 2008-11-07 17:49:41.000000000 +0900 ++++ xarchiver-0.5.2/src/archive.h 2013-05-11 10:01:47.888094708 +0900 +@@ -30,6 +30,7 @@ + XARCHIVETYPE_BZIP2, + XARCHIVETYPE_GZIP, + XARCHIVETYPE_LZMA, ++ XARCHIVETYPE_XZ, + XARCHIVETYPE_LZOP, + XARCHIVETYPE_RAR, + XARCHIVETYPE_RPM, +@@ -37,6 +38,7 @@ + XARCHIVETYPE_TAR_BZ2, + XARCHIVETYPE_TAR_GZ, + XARCHIVETYPE_TAR_LZMA, ++ XARCHIVETYPE_TAR_XZ, + XARCHIVETYPE_TAR_LZOP, + XARCHIVETYPE_ZIP, + XARCHIVETYPE_LHA, +diff -uNr xarchiver-0.5.2.orig/src/bzip2.c xarchiver-0.5.2/src/bzip2.c +--- xarchiver-0.5.2.orig/src/bzip2.c 2008-11-10 20:17:48.000000000 +0900 ++++ xarchiver-0.5.2/src/bzip2.c 2013-05-11 10:01:47.888094708 +0900 +@@ -54,6 +54,15 @@ + archive->extract = extract[archive->type]; + xa_open_tar_compressed_file(archive); + } ++ else if (g_str_has_suffix(archive->escaped_path,".tar.xz") || g_str_has_suffix (archive->escaped_path,".txz")) ++ { ++ archive->type = XARCHIVETYPE_TAR_XZ; ++ archive->format = "TAR.XZ"; ++ archive->delete = delete[archive->type]; ++ archive->add = add[archive->type]; ++ archive->extract = extract[archive->type]; ++ xa_open_tar_compressed_file(archive); ++ } + else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") || + g_str_has_suffix (archive->escaped_path,".tzo") || + g_str_has_suffix(archive->escaped_path,".tar.lzo")) +@@ -85,6 +94,12 @@ + executable = "lzma "; + len = 5; + } ++ else if (archive->type == XARCHIVETYPE_XZ) ++ { ++ archive->format = "XZ"; ++ executable = "xz "; ++ len = 5; ++ } + else if (archive->type == XARCHIVETYPE_LZOP) + { + archive->format = "LZOP"; +@@ -163,6 +178,8 @@ + command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_LZMA) + command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL); ++ else if (archive->type == XARCHIVETYPE_TAR_XZ) ++ command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_LZOP) + command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL); + /* else fail? */ +@@ -205,6 +222,11 @@ + executable = "lzma "; + len = 5; + } ++ else if (archive->type == XARCHIVETYPE_XZ) ++ { ++ executable = "xz "; ++ len = 5; ++ } + else if (archive->type == XARCHIVETYPE_LZOP) + { + executable = "lzop "; +diff -uNr xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c +--- xarchiver-0.5.2.orig/src/extract_dialog.c 2008-11-10 19:28:11.000000000 +0900 ++++ xarchiver-0.5.2/src/extract_dialog.c 2013-05-11 10:01:47.889094708 +0900 +@@ -815,6 +815,11 @@ + archive->type = XARCHIVETYPE_TAR_LZMA; + archive->extract = extract[XARCHIVETYPE_TAR_LZMA]; + } ++ else if (g_str_has_suffix(archive->escaped_path,".tar.xz")|| g_str_has_suffix (archive->escaped_path,".txz")) ++ { ++ archive->type = XARCHIVETYPE_TAR_XZ; ++ archive->extract = extract[XARCHIVETYPE_TAR_XZ]; ++ } + else if (g_str_has_suffix(archive->escaped_path,".tar.lzop") || + g_str_has_suffix (archive->escaped_path,".tzo") || + g_str_has_suffix(archive->escaped_path,".tar.lzo")) +diff -uNr xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c +--- xarchiver-0.5.2.orig/src/main.c 2008-11-10 20:21:43.000000000 +0900 ++++ xarchiver-0.5.2/src/main.c 2013-05-11 10:17:01.696094044 +0900 +@@ -296,9 +296,10 @@ + open_archive[XARCHIVETYPE_BZIP2] = &xa_open_bzip2_lzma; + open_archive[XARCHIVETYPE_GZIP] = &xa_open_gzip; + open_archive[XARCHIVETYPE_LZMA] = &xa_open_bzip2_lzma; ++ open_archive[XARCHIVETYPE_XZ] = &xa_open_bzip2_lzma; + open_archive[XARCHIVETYPE_RAR] = &xa_open_rar; + open_archive[XARCHIVETYPE_RPM] = &xa_open_rpm; +- open_archive[XARCHIVETYPE_TAR] = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar; ++ open_archive[XARCHIVETYPE_TAR] = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar; + open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip; + open_archive[XARCHIVETYPE_LHA] = &xa_open_lha; + open_archive[XARCHIVETYPE_LZOP] = &xa_open_bzip2_lzma; +@@ -310,9 +311,10 @@ + delete[XARCHIVETYPE_BZIP2] = 0; + delete[XARCHIVETYPE_GZIP] = 0; + delete[XARCHIVETYPE_LZMA] = 0; ++ delete[XARCHIVETYPE_XZ] = 0; + delete[XARCHIVETYPE_RAR] = &xa_rar_delete; + delete[XARCHIVETYPE_RPM] = 0; +- delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete; ++ delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete; + delete[XARCHIVETYPE_ZIP] = &xa_zip_delete; + delete[XARCHIVETYPE_LHA] = &xa_lha_delete; + delete[XARCHIVETYPE_LZOP] = 0; +@@ -322,10 +324,10 @@ + add[XARCHIVETYPE_7ZIP] = &xa_7zip_add; + add[XARCHIVETYPE_ARJ] = &xa_arj_add; + add[XARCHIVETYPE_DEB] = 0; +- add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = &xa_tar_add; ++ add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add; + add[XARCHIVETYPE_RAR] = &xa_rar_add; + add[XARCHIVETYPE_RPM] = 0; +- add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add; ++ add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add; + add[XARCHIVETYPE_ZIP] = &xa_zip_add; + add[XARCHIVETYPE_LHA] = &xa_lha_add; + add[XARCHIVETYPE_LZOP] = &xa_tar_add; +@@ -334,10 +336,10 @@ + extract[XARCHIVETYPE_7ZIP] = &xa_7zip_extract; + extract[XARCHIVETYPE_ARJ] = &xa_arj_extract; + extract[XARCHIVETYPE_DEB] = &xa_deb_extract;; +- extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = &xa_tar_extract; ++ extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = &xa_tar_extract; + extract[XARCHIVETYPE_RAR] = &xa_rar_extract; + extract[XARCHIVETYPE_RPM] = &xa_rpm_extract; +- extract[XARCHIVETYPE_TAR] = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract; ++ extract[XARCHIVETYPE_TAR] = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract; + extract[XARCHIVETYPE_ZIP] = &xa_zip_extract; + extract[XARCHIVETYPE_LHA] = &xa_lha_extract; + extract[XARCHIVETYPE_LZOP] = &xa_tar_extract; +@@ -345,10 +347,10 @@ + test[0] = 0; + test[XARCHIVETYPE_7ZIP] = &xa_7zip_test; + test[XARCHIVETYPE_ARJ] = &xa_arj_test; +- test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = 0; ++ test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0; + test[XARCHIVETYPE_RAR] = &xa_rar_test; + test[XARCHIVETYPE_RPM] = 0; +- test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_LZOP] = 0; ++ test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0; + test[XARCHIVETYPE_ZIP] = &xa_zip_test; + test[XARCHIVETYPE_LHA] = &xa_lha_test; + test[XARCHIVETYPE_LZOP] = 0; +@@ -392,6 +394,14 @@ + g_free (absolute_path); + } + ++ absolute_path = g_find_program_in_path("xz"); ++ if ( absolute_path ) ++ { ++ ArchiveType = g_list_append(ArchiveType, "xz"); ++ ArchiveSuffix = g_list_append(ArchiveSuffix, "*.xz"); ++ g_free (absolute_path); ++ } ++ + absolute_path = g_find_program_in_path("lzop"); + if ( absolute_path ) + { +@@ -460,6 +470,11 @@ + ArchiveType = g_list_append(ArchiveType, "tar.lzma"); + ArchiveSuffix = g_list_append(ArchiveSuffix, "*.tlz"); + } ++ if ( g_list_find ( ArchiveType , "xz") ) ++ { ++ ArchiveType = g_list_append(ArchiveType, "tar.xz"); ++ ArchiveSuffix = g_list_append(ArchiveSuffix, "*.txz"); ++ } + if ( g_list_find ( ArchiveType , "lzo") ) + { + ArchiveType = g_list_append(ArchiveType, "tar.lzo"); +@@ -528,6 +543,8 @@ + archive->type = XARCHIVETYPE_TAR_GZ; + else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzma") || g_str_has_suffix ( archive->escaped_path , ".tlz") ) + archive->type = XARCHIVETYPE_TAR_LZMA; ++ else if ( g_str_has_suffix ( archive->escaped_path , ".tar.xz") || g_str_has_suffix ( archive->escaped_path , ".txz") ) ++ archive->type = XARCHIVETYPE_TAR_XZ; + else if ( g_str_has_suffix ( archive->escaped_path , ".tar.lzo") || + g_str_has_suffix ( archive->escaped_path , ".tzo") || + g_str_has_suffix ( archive->escaped_path , ".tar.lzop")) +diff -uNr xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c +--- xarchiver-0.5.2.orig/src/new_dialog.c 2008-11-11 17:28:46.000000000 +0900 ++++ xarchiver-0.5.2/src/new_dialog.c 2013-05-11 10:01:47.890094708 +0900 +@@ -202,6 +202,8 @@ + type = XARCHIVETYPE_GZIP; + else if (strcmp ( ComboArchiveType,"lzma") == 0) + type = XARCHIVETYPE_LZMA; ++ else if (strcmp ( ComboArchiveType,"xz") == 0) ++ type = XARCHIVETYPE_XZ; + else if (strcmp ( ComboArchiveType,"lzo") == 0) + type = XARCHIVETYPE_LZOP; + else if (strcmp ( ComboArchiveType,"rar") == 0) +@@ -214,6 +216,8 @@ + type = XARCHIVETYPE_TAR_GZ; + else if (strcmp ( ComboArchiveType,"tar.lzma") == 0) + type = XARCHIVETYPE_TAR_LZMA; ++ else if (strcmp ( ComboArchiveType,"tar.xz") == 0) ++ type = XARCHIVETYPE_TAR_XZ; + else if (strcmp ( ComboArchiveType,"tar.lzo") == 0) + type = XARCHIVETYPE_TAR_LZOP; + else if (strcmp ( ComboArchiveType,"jar") == 0 || strcmp ( ComboArchiveType,"zip") == 0 ) +diff -Naur xarchiver-0.5.2.orig/src/rpm.c xarchiver-0.5.2/src/rpm.c +--- xarchiver-0.5.2.orig/src/rpm.c 2014-01-24 03:07:47.729711000 +0100 ++++ xarchiver-0.5.2/src/rpm.c 2014-01-24 03:12:43.717122918 +0100 +@@ -111,8 +111,10 @@ + } + if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP) + executable = "gzip -dc "; +- else ++ else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2) + executable = "bzip2 -dc "; ++ else ++ executable = "xz -dc "; + + command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL); + g_free(gzip_tmp);diff -uNr xarchiver-0.5.2.orig/src/tar.c xarchiver-0.5.2/src/tar.c +--- xarchiver-0.5.2.orig/src/tar.c 2008-11-10 19:28:34.000000000 +0900 ++++ xarchiver-0.5.2/src/tar.c 2013-05-11 10:12:01.027094262 +0900 +@@ -242,6 +242,17 @@ + files->str , NULL ); + break; + ++ case XARCHIVETYPE_TAR_XZ: ++ if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) ++ xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); ++ else ++ command = g_strconcat (tar, " ", ++ archive->add_recurse ? "" : "--no-recursion ", ++ archive->remove_files ? "--remove-files " : "", ++ "--use-compress-program=xz -cvvf ",archive->escaped_path, ++ files->str , NULL ); ++ break; ++ + case XARCHIVETYPE_TAR_LZOP: + if ( g_file_test ( archive->escaped_path , G_FILE_TEST_EXISTS ) ) + xa_add_delete_bzip2_gzip_lzma_compressed_tar (files,archive,1); +@@ -265,6 +276,10 @@ + command = g_strconcat("sh -c \"lzma -c ",files->str,"> ",archive->escaped_path,"\"",NULL); + break; + ++ case XARCHIVETYPE_XZ: ++ command = g_strconcat("sh -c \"xz -c ",files->str,"> ",archive->escaped_path,"\"",NULL); ++ break; ++ + case XARCHIVETYPE_LZOP: + command = g_strconcat("sh -c \"lzop -c ",files->str,"> ",archive->escaped_path,"\"",NULL); + break; +@@ -378,6 +393,25 @@ + } + break; + ++ case XARCHIVETYPE_TAR_XZ: ++ if (archive->full_path == 1) ++ { ++ command = g_strconcat (tar, " --use-compress-program=xz -xvf " , archive->escaped_path, ++ #ifdef __FreeBSD__ ++ archive->overwrite ? " " : " -k", ++ #else ++ archive->overwrite ? " --overwrite" : " --keep-old-files", ++ #endif ++ archive->tar_touch ? " --touch" : "", ++ " -C ",archive->extraction_path," ",names->str,NULL); ++ } ++ else ++ { ++ result = xa_extract_tar_without_directories ( "tar --use-compress-program=xz -xvf ",archive,names->str); ++ command = NULL; ++ } ++ break; ++ + case XARCHIVETYPE_TAR_LZOP: + if (archive->full_path == 1) + { +@@ -402,6 +436,11 @@ + command = NULL; + break; + ++ case XARCHIVETYPE_XZ: ++ result = lzma_bzip2_extract(archive,NULL); ++ command = NULL; ++ break; ++ + case XARCHIVETYPE_LZOP: + result = lzma_bzip2_extract(archive,NULL); + command = NULL; +@@ -449,6 +488,10 @@ + executable = "lzma -f "; + filename = "dummy.lzma"; + break; ++ case XARCHIVETYPE_TAR_XZ: ++ executable = "xz -f "; ++ filename = "dummy.xz"; ++ break; + case XARCHIVETYPE_TAR_LZOP: + executable = "lzop -f "; + filename = "dummy.lzo"; +@@ -493,7 +536,7 @@ + + gboolean is_tar_compressed (gint type) + { +- return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_LZOP); ++ return (type == XARCHIVETYPE_TAR_BZ2 || type == XARCHIVETYPE_TAR_GZ || type == XARCHIVETYPE_TAR_LZMA || type == XARCHIVETYPE_TAR_XZ || type == XARCHIVETYPE_TAR_LZOP); + } + + gboolean xa_extract_tar_without_directories (gchar *string,XArchive *archive,gchar *files_to_extract) +diff -uNr xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2008-11-11 17:31:45.000000000 +0900 ++++ xarchiver-0.5.2/src/window.c 2013-05-11 10:01:47.892094708 +0900 +@@ -1125,6 +1125,8 @@ + xx = XARCHIVETYPE_GZIP; + else if (memcmp ( magic,"\x5d\x00\x00\x80",4) == 0) + xx = XARCHIVETYPE_LZMA; ++ else if ((memcmp ( magic,"\xFD" "7zXZ\x00\x00",7) == 0) || (memcmp ( magic,"\xFD" "7zXZ\x00\x10",7) == 0)) ++ xx = XARCHIVETYPE_XZ; + else if (memcmp ( magic,"\211LZO",4) == 0) + xx = XARCHIVETYPE_LZOP; + else if (memcmp ( magic,"\xed\xab\xee\xdb",4) == 0) +@@ -1462,6 +1464,7 @@ + case XARCHIVETYPE_GZIP: + case XARCHIVETYPE_BZIP2: + case XARCHIVETYPE_LZMA: ++ case XARCHIVETYPE_XZ: + case XARCHIVETYPE_LZOP: + case XARCHIVETYPE_RPM: + pos = 3; +@@ -1481,6 +1484,7 @@ + case XARCHIVETYPE_TAR_GZ: + case XARCHIVETYPE_TAR_BZ2: + case XARCHIVETYPE_TAR_LZMA: ++ case XARCHIVETYPE_TAR_XZ: + case XARCHIVETYPE_TAR_LZOP: + case XARCHIVETYPE_TAR: + case XARCHIVETYPE_ZIP: +@@ -1525,6 +1529,7 @@ + case XARCHIVETYPE_GZIP: + case XARCHIVETYPE_BZIP2: + case XARCHIVETYPE_LZMA: ++ case XARCHIVETYPE_XZ: + case XARCHIVETYPE_LZOP: + case XARCHIVETYPE_RPM: + pos = 3; +@@ -1544,6 +1549,7 @@ + case XARCHIVETYPE_TAR_GZ: + case XARCHIVETYPE_TAR_BZ2: + case XARCHIVETYPE_TAR_LZMA: ++ case XARCHIVETYPE_TAR_XZ: + case XARCHIVETYPE_TAR_LZOP: + case XARCHIVETYPE_TAR: + case XARCHIVETYPE_ZIP: diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch new file mode 100644 index 000000000..10def7d21 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-drag-n-drop_escaped_path.patch @@ -0,0 +1,13 @@ +diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2012-01-12 13:28:54.000000000 +0100 ++++ xarchiver-0.5.2/src/window.c 2012-01-23 20:43:49.622745851 +0100 +@@ -1724,6 +1724,9 @@ + gtk_tree_selection_selected_foreach (selection,(GtkTreeSelectionForeachFunc) xa_concat_selected_filenames,&names); + archive->full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->extract_full)); + archive->overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->overwrite_check)); ++ gchar *unescaped_extraction_path = archive->extraction_path; ++ archive->extraction_path = xa_escape_filename(unescaped_extraction_path, "$'`\"\\!?* ()[]&|:;<>#"); ++ g_free(unescaped_extraction_path); + (*archive->extract) (archive,names); + + g_list_foreach (row_list,(GFunc) gtk_tree_path_free,NULL); diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch new file mode 100644 index 000000000..8b44d91a0 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix-double-escaping.patch @@ -0,0 +1,32 @@ +From: =?UTF-8?q?Guido=20Berh=C3=B6rster?= +Date: Sat, 19 Jan 2013 09:27:36 +0100 +Subject: fix-double-escaping + +Do not escape file names twice. Fixes an error when trying to create archives +with spaces. + +Bug: http://bugs.debian.org/697493. +--- + src/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index a13d737..a6a7f93 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -208,13 +208,13 @@ int main (int argc, char **argv) + g_free(_current_dir); + GSList *files = NULL; + _current_dir = g_path_get_basename(add_files); +- files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#")); ++ files = g_slist_append(files,g_strdup(_current_dir)); + g_free(_current_dir); + g_free(add_files); + for (x = 1; x< argc; x++) + { + _current_dir = g_path_get_basename(argv[x]); +- files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#")); ++ files = g_slist_append(files,g_strdup(_current_dir)); + g_free (_current_dir); + } + xa_execute_add_commands(archive,files,NULL); diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch new file mode 100644 index 000000000..e63687579 --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix-non-existent-archive.patch @@ -0,0 +1,26 @@ +From: Markus Koschany +Date: Thu, 28 Feb 2013 17:45:50 +0100 +Subject: fix segfault non-existent archive cmdl switch x + +If using the command line switch -x, the user needs to specify a valid/existent +archive. If the name of the archive is mistyped, xarchiver will segfault. This +patch fixes the issue. + +Bug: http://bugs.debian.org/701909 +--- + src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index a6a7f93..a6e05e3 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -141,7 +141,7 @@ int main (int argc, char **argv) + /* Switch -x */ + if (extract_path != NULL) + { +- if (argv[1] == NULL) ++ if (argv[1] == NULL || archive == NULL) + { + response = xa_show_message_dialog (NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't extract files from the archive:"),_("You missed the archive name!\n")); + return -1; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch new file mode 100644 index 000000000..aa2283a7e --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-no-donators-menu.patch @@ -0,0 +1,50 @@ +--- xarchiver/trunk/src/interface.c 2009/03/19 18:03:52 29676 ++++ xarchiver/trunk/src/interface.c 2009/03/19 20:48:19 29677 +@@ -310,22 +310,14 @@ + gtk_widget_show (tmp_image); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1),tmp_image); + ++ donate = gtk_image_menu_item_new_with_mnemonic (_("_Donate")); ++ gtk_widget_show (donate); ++ gtk_container_add (GTK_CONTAINER (menuitem4_menu),donate); ++ + about1 = gtk_image_menu_item_new_from_stock ("gtk-about",accel_group); + gtk_widget_show (about1); + gtk_container_add (GTK_CONTAINER (menuitem4_menu),about1); + +- thanks_to = gtk_image_menu_item_new_with_mnemonic (_("_Thanks to")); +- gtk_widget_show (thanks_to); +- gtk_container_add (GTK_CONTAINER (menuitem4_menu),thanks_to); +- +- thanks_to_submenu = gtk_menu_new(); +- gtk_widget_show (thanks_to_submenu); +- gtk_menu_item_set_submenu (GTK_MENU_ITEM (thanks_to),thanks_to_submenu); +- +- donators = gtk_image_menu_item_new_with_mnemonic ("Your name and website here"); +- gtk_widget_show (donators); +- gtk_container_add (GTK_CONTAINER (thanks_to_submenu),donators); +- + /* Create the toolbar */ + toolbar1 = gtk_toolbar_new (); + gtk_widget_show (toolbar1); +@@ -543,7 +535,7 @@ + g_signal_connect ((gpointer) multi_extract_menu,"activate",G_CALLBACK (xa_show_multi_extract_dialog),NULL); + g_signal_connect ((gpointer) help1,"activate",G_CALLBACK (xa_show_help),NULL); + g_signal_connect ((gpointer) about1,"activate",G_CALLBACK (xa_about),NULL); +- g_signal_connect ((gpointer) donators,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL); ++ g_signal_connect ((gpointer) donate,"activate",G_CALLBACK (xa_show_donate_page_on_the_web),NULL); + + g_signal_connect ((gpointer) New_button, "clicked",G_CALLBACK (xa_new_archive),NULL); + g_signal_connect ((gpointer) Open_button, "clicked",G_CALLBACK (xa_open_archive),NULL); +--- xarchiver/trunk/src/interface.h 2008/11/04 10:06:17 28603 ++++ xarchiver/trunk/src/interface.h 2009/03/19 20:48:19 29677 +@@ -48,8 +48,8 @@ + *name_label, *type_label, *compression_data, *encrypted_data, *encrypted_label,*number_of_files_data, *content_data, *comment_data, *size_data, *modified_data, *path_data, *type_data, + *name_data, *separatormenuitem1, *separatormenuitem2, *separatormenuitem3, *separatormenuitem4, *separatormenuitem5, *separatormenuitem6, *quit1, + *close1, *check_menu, *properties, *menuitem2, *menuitem2_menu, *addfile, *extract_menu, *delete_menu, *comment_menu, *multi_extract_menu,*view_shell_output1, +-*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *thanks_to,*thanks_to_submenu,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu, +-*about1, *help1, *donators,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button, ++*prefs_menu,*password_entry_menu, *image1, *image2, *menuitem4, *donate,*select_all,*deselect_all,*select_pattern, *exe_menu, *menuitem4_menu, ++*about1, *help1,*toolbar1, *toolbar2, *hbox1, *tmp_image, *pad_image, *New_button, *Open_button, *back_button, *home_button, *forward_button, + *up_button,*separatortoolitem1,*separatortoolitem2,*separatortoolitem3,*AddFile_button,*Extract_button,*Stop_button,*toolitem1,*location_label, + *location_entry,*hpaned1,*archive_dir_treeview,*scrolledwindow2,*ddelete,*rename_menu,*rrename,*cut,*copy,*paste,*view,*open_popupmenu; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch new file mode 100644 index 000000000..b8052544b --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-delete-file.patch @@ -0,0 +1,21 @@ +diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2014-01-24 01:22:27.931903000 +0100 ++++ xarchiver-0.5.2/src/window.c 2014-01-24 01:24:49.952825715 +0100 +@@ -1573,7 +1573,7 @@ + gtk_widget_show(selected_frame); + gtk_widget_set_sensitive(deselect_all,TRUE); + } +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) ++ if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) + { + gtk_widget_set_sensitive (delete_menu,FALSE); + gtk_widget_set_sensitive (rename_menu,FALSE); +@@ -2287,7 +2287,7 @@ + else + value = TRUE; + } +- if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM) ++ if (archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP || archive->type == XARCHIVETYPE_DEB || archive->type == XARCHIVETYPE_RPM) + { + gtk_widget_set_sensitive(ddelete,FALSE); + gtk_widget_set_sensitive(rrename,FALSE); diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch new file mode 100644 index 000000000..a1fa1f2ca --- /dev/null +++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch @@ -0,0 +1,43 @@ +diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c +--- xarchiver-0.5.2.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100 ++++ xarchiver-0.5.2/src/window.c 2014-01-24 08:42:45.110729290 +0100 +@@ -1694,7 +1694,7 @@ + { + if (archive->passwd == NULL) + { +- archive->passwd = xa_create_password_dialog(NULL); ++ archive->passwd = xa_create_password_dialog(archive); + if ( archive->passwd == NULL) + { + gtk_drag_finish (dc,FALSE,FALSE,t); +@@ -2702,9 +2702,12 @@ + + if (entry->is_encrypted) + { +- archive[idx]->passwd = xa_create_password_dialog(archive[idx]); + if (archive[idx]->passwd == NULL) +- return; ++ { ++ archive[idx]->passwd = xa_create_password_dialog(archive[idx]); ++ if (archive[idx]->passwd == NULL) ++ return; ++ } + } + filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL); + if (g_file_test(filename,G_FILE_TEST_EXISTS)) +@@ -2766,6 +2769,15 @@ + /* The selected entry it's not a dir so extract it to the tmp dir and send it to xa_determine_program_to_run() */ + else + { ++ if (entry->is_encrypted) ++ { ++ if (archive->passwd == NULL) ++ { ++ archive->passwd = xa_create_password_dialog(archive); ++ if (archive->passwd == NULL) ++ return; ++ } ++ } + if (archive->extraction_path) + { + dummy = g_strdup(archive->extraction_path); -- cgit v1.2.3 From afa299d791f691fc6b20c4448af14d37d0153fba Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 24 Jan 2014 11:41:28 -0200 Subject: ice{cat,weasel}-noscript-2.6.8.13-1: updating version --- libre/icecat-noscript/PKGBUILD | 6 +++--- libre/iceweasel-noscript/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 3bff180e8..16579acdd 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104068 2014-01-15 09:48:41Z spupykin $ +# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.12 +pkgver=2.6.8.13 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('da4f024487e5ef057eb6377f8bd285b5') +md5sums=('75ec11cc5f3f039e81113abfb908110e') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 09bfbe6e8..5cde02a92 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104068 2014-01-15 09:48:41Z spupykin $ +# $Id: PKGBUILD 104641 2014-01-24 07:00:27Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.12 +pkgver=2.6.8.13 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('da4f024487e5ef057eb6377f8bd285b5') +md5sums=('75ec11cc5f3f039e81113abfb908110e') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` -- cgit v1.2.3 From e3e5de81a2d3ed889cd4edfc25f24747cb294957 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 24 Jan 2014 13:16:11 -0200 Subject: xarchiver-libre: fix xarchiver-0.5.2-add_unar_support.patch --- libre/xarchiver-libre/PKGBUILD | 2 +- .../xarchiver-0.5.2-add-unar-support.patch | 354 --------------------- .../xarchiver-0.5.2-add_unar_support.patch | 62 ++-- 3 files changed, 45 insertions(+), 373 deletions(-) delete mode 100644 libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch (limited to 'libre') diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index df6bfbca6..e606e65f4 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -47,7 +47,7 @@ md5sums=('2bc7f06403cc6582dd4a8029ec9d038d' '22ed2783e72684a102243c5834bf5ca3' 'e518b1e0bc4407383aae2783c0c19a04' 'c46daf2ee9fce7ece608eca33174db6b' - '13c133a6ba867425b9a8a13900664d18' + '1bfed3e1a9f8f4858ec90f0d66cfc5ba' '36a4c3181230aab1e0ce1596acc5ef88') prepare() { diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch deleted file mode 100644 index 25c1d66ab..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.2-add-unar-support.patch +++ /dev/null @@ -1,354 +0,0 @@ -diff -Nur xarchiver-0.5.2.orig/doc/html/ch03s03.html xarchiver-0.5.2/doc/html/ch03s03.html ---- xarchiver-0.5.2.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 -+++ xarchiver-0.5.2/doc/html/ch03s03.html 2014-01-24 11:26:24.869538956 -0200 -@@ -1,7 +1,7 @@ - - - General
General
Prev Chapter 3. Usage Next

General

Startup

-- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. -+ At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script xdg-open for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created. -

How it works

- Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script xdg-open will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it. -

Drag and Drop

-diff -Nur xarchiver-0.5.2.orig/doc/xarchiver.docbook xarchiver-0.5.2/doc/xarchiver.docbook ---- xarchiver-0.5.2.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 -+++ xarchiver-0.5.2/doc/xarchiver.docbook 2014-01-24 11:25:23.413824351 -0200 -@@ -204,7 +204,7 @@ -

- Startup - -- At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. -+ At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened and extracted but not to be created. - -
-
-diff -Nur xarchiver-0.5.2.orig/src/extract_dialog.c xarchiver-0.5.2/src/extract_dialog.c ---- xarchiver-0.5.2.orig/src/extract_dialog.c 2008-11-10 08:28:11.000000000 -0200 -+++ xarchiver-0.5.2/src/extract_dialog.c 2014-01-24 10:55:28.209263885 -0200 -@@ -24,7 +24,7 @@ - #include "string_utils.h" - #include "support.h" - --extern gboolean unrar,batch_mode; -+extern gboolean unar,batch_mode; - extern Prefs_dialog_data *prefs_window; - extern Progress_bar_data *pb; - extern extract_func extract [XARCHIVETYPE_COUNT]; -@@ -290,11 +290,7 @@ - GSList *names = NULL; - GtkTreeModel *model; - int response; -- -- if (unrar) -- rar = "unrar"; -- else -- rar = "rar"; -+ rar = "unar"; - - while (! done) - { -diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c ---- xarchiver-0.5.2.orig/src/interface.c 2008-11-11 06:09:01.000000000 -0200 -+++ xarchiver-0.5.2/src/interface.c 2014-01-24 10:56:03.893317117 -0200 -@@ -45,7 +45,7 @@ - { "text/uri-list",0,0 }, - }; - --extern gboolean unrar,batch_mode; -+extern gboolean unar,batch_mode; - - static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); - static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); -@@ -629,7 +629,7 @@ - { - gtk_widget_show(selected_frame); - gtk_widget_set_sensitive(deselect_all,TRUE); -- if (archive[id]->type == XARCHIVETYPE_RAR && unrar) -+ if (archive[id]->type == XARCHIVETYPE_RAR && unar) - { - gtk_widget_set_sensitive (delete_menu,FALSE); - gtk_widget_set_sensitive (rename_menu,FALSE); -diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c ---- xarchiver-0.5.2.orig/src/main.c 2008-11-10 09:21:43.000000000 -0200 -+++ xarchiver-0.5.2/src/main.c 2014-01-24 10:59:39.108832843 -0200 -@@ -33,7 +33,7 @@ - gchar *add_files; - gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; - gboolean batch_mode = FALSE; --gboolean unrar = FALSE; -+gboolean unar = FALSE; - gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; - int response; - extern gchar *current_open_directory; -@@ -410,24 +410,14 @@ - //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); - } - -- absolute_path = g_find_program_in_path ("rar"); -- if ( absolute_path ) -+ absolute_path = g_find_program_in_path("unar"); -+ if ( absolute_path ) - { -+ unar = TRUE; - ArchiveType = g_list_append(ArchiveType, "rar"); - ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); - g_free (absolute_path); - } -- else -- { -- absolute_path = g_find_program_in_path("unrar"); -- if ( absolute_path ) -- { -- unrar = TRUE; -- ArchiveType = g_list_append(ArchiveType, "rar"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); -- g_free (absolute_path); -- } -- } - - absolute_path = g_find_program_in_path("cpio"); - if ( absolute_path ) -diff -Nur xarchiver-0.5.2.orig/src/new_dialog.c xarchiver-0.5.2/src/new_dialog.c ---- xarchiver-0.5.2.orig/src/new_dialog.c 2008-11-11 06:28:46.000000000 -0200 -+++ xarchiver-0.5.2/src/new_dialog.c 2014-01-24 10:56:34.274491565 -0200 -@@ -24,7 +24,7 @@ - #include "string_utils.h" - #include "main.h" - --extern gboolean unrar; -+extern gboolean unar; - extern Prefs_dialog_data *prefs_window; - gchar *current_new_directory = NULL; - gint new_combo_box = -1; -diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog.c ---- xarchiver-0.5.2.orig/src/pref_dialog.c 2008-11-10 06:05:07.000000000 -0200 -+++ xarchiver-0.5.2/src/pref_dialog.c 2014-01-24 10:54:07.611853842 -0200 -@@ -23,7 +23,7 @@ - #include "main.h" - #include "support.h" - --extern gboolean unrar; -+extern gboolean unar; - extern gboolean xdg_open; - extern Extract_dialog_data *extract_window; - extern Add_dialog_data *add_window; -@@ -104,7 +104,7 @@ - { - if (strcmp(archive_type->data, "tgz") == 0 || - strcmp(archive_type->data, "rpm") == 0 || -- (strcmp(archive_type->data, "rar") == 0 && unrar) ) -+ (strcmp(archive_type->data, "rar") == 0 && unar) ) - goto next; - else - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); -diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c ---- xarchiver-0.5.2.orig/src/rar.c 2008-11-10 06:05:07.000000000 -0200 -+++ xarchiver-0.5.2/src/rar.c 2014-01-24 10:50:11.672526720 -0200 -@@ -20,7 +20,7 @@ - #include "rar.h" - #include - --extern gboolean unrar; -+extern gboolean unar; - extern void xa_reload_archive_content(XArchive *archive); - extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]); - -@@ -30,19 +30,10 @@ - gchar *command = NULL; - gchar *rar = NULL; - jump_header = read_filename = last_line = encrypted = FALSE; -+ rar = "unar"; -+ archive->can_add = archive->has_sfx = FALSE; - -- if (unrar) -- { -- rar = "unrar"; -- archive->can_add = archive->has_sfx = FALSE; -- } -- else -- { -- rar = "rar"; -- archive->can_add = archive->has_sfx = TRUE; -- } -- -- command = g_strconcat ( rar," v " , archive->escaped_path, NULL ); -+ command = g_strconcat ( rar, archive->escaped_path, NULL ); - archive->can_extract = archive->has_test = archive->has_properties = TRUE; - archive->dummy_size = 0; - archive->nr_of_files = 0; -@@ -222,71 +213,6 @@ - } - } - --void xa_rar_delete (XArchive *archive,GSList *names) --{ -- gchar *command,*e_filename = NULL; -- GSList *list = NULL,*_names; -- GString *files = g_string_new(""); -- -- _names = names; -- while (_names) -- { -- e_filename = xa_escape_filename((gchar*)_names->data,"$'`\"\\!?* ()[]&|:;<>#"); -- g_string_prepend (files,e_filename); -- g_string_prepend_c (files,' '); -- _names = _names->next; -- } -- g_slist_foreach(names,(GFunc)g_free,NULL); -- g_slist_free(names); -- -- command = g_strconcat ("rar d ",archive->escaped_path," ",files->str,NULL); -- g_string_free(files,TRUE); -- list = g_slist_append(list,command); -- -- xa_run_command (archive,list); -- if (archive->status == XA_ARCHIVESTATUS_DELETE) -- xa_reload_archive_content(archive); --} -- --void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string) --{ -- GSList *list = NULL; -- gchar *command = NULL; -- -- if (archive->location_entry_path != NULL) -- archive->working_dir = g_strdup(archive->tmp); -- -- if (compression_string == NULL) -- compression_string = "3"; -- if (archive->passwd != NULL) -- command = g_strconcat ( "rar a ", -- archive->update ? "-u " : "", -- archive->freshen ? "-f " : "", -- archive->solid_archive ? "-s " : "", -- archive->remove_files ? "-df " : "", -- "-p" , archive->passwd, -- " -idp ", -- "-m",compression_string," ", -- archive->escaped_path, -- files->str,NULL); -- else -- command = g_strconcat ( "rar a ", -- archive->update ? "-u " : "", -- archive->freshen ? "-f " : "", -- archive->solid_archive ? "-s " : " ", -- archive->remove_files ? "-df " : " ", -- "-idp ", -- "-m",compression_string," ", -- archive->escaped_path, -- files->str,NULL); -- -- g_string_free(files,TRUE); -- list = g_slist_append(list,command); -- -- xa_run_command (archive,list); -- xa_reload_archive_content(archive); --} -- - gboolean xa_rar_extract(XArchive *archive,GSList *files) - { - gchar *rar, *command, *e_filename = NULL; -@@ -295,10 +221,8 @@ - gboolean result = FALSE; - - _files = files; -- if (unrar) -- rar = "unrar"; -- else -- rar = "rar"; -+ (unar) -+ rar = "unar"; - - while (_files) - { -@@ -311,17 +235,13 @@ - g_slist_free(_files); - - if (archive->passwd != NULL) -- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", -- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", -+ command = g_strconcat (rar," ",archive->full_path ? "-q ", - " -p",archive->passwd, -- archive->overwrite ? " -o+" : " -o-", -- " -idp ", -+ archive->overwrite ? " -f", - archive->escaped_path,names->str," ",archive->extraction_path , NULL ); - else -- command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", -- archive->freshen ? "-f " : "" , archive->update ? "-u " : "", -- archive->overwrite ? "-o+" : "-o-", -- " -idp ", -+ command = g_strconcat (rar," ",archive->full_path ? "-q ", -+ archive->overwrite ? " -f", - archive->escaped_path,names->str," ",archive->extraction_path , NULL ); - g_string_free(names,TRUE); - list = g_slist_append(list,command); -@@ -329,24 +249,3 @@ - result = xa_run_command (archive,list); - return result; - } -- --void xa_rar_test (XArchive *archive) --{ -- gchar *rar = NULL; -- gchar *command = NULL; -- GSList *list = NULL; -- -- if (unrar) -- rar = "unrar"; -- else -- rar = "rar"; -- -- archive->status = XA_ARCHIVESTATUS_TEST; -- if (archive->passwd != NULL) -- command = g_strconcat (rar," t -idp -p" , archive->passwd ," " , archive->escaped_path, NULL); -- else -- command = g_strconcat (rar," t -idp " , archive->escaped_path, NULL); -- -- list = g_slist_append(list,command); -- xa_run_command (archive,list); -- } -diff -Nur xarchiver-0.5.2.orig/src/rar.h xarchiver-0.5.2/src/rar.h ---- xarchiver-0.5.2.orig/src/rar.h 2008-08-22 05:12:38.000000000 -0300 -+++ xarchiver-0.5.2/src/rar.h 2014-01-24 10:49:13.140141939 -0200 -@@ -26,10 +26,7 @@ - #include "support.h" - #include "archive.h" - gboolean jump_header,jump_comment,read_filename, last_line, encrypted; --void xa_rar_delete (XArchive *,GSList *); --void xa_rar_add (XArchive *,GString *,gchar *); - gboolean xa_rar_extract(XArchive *,GSList *); --void xa_rar_test (XArchive *); - void xa_get_rar_line_content (gchar *line, gpointer data); - void xa_open_rar ( XArchive *archive ); - #endif -diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c ---- xarchiver-0.5.2.orig/src/window.c 2008-11-11 06:31:45.000000000 -0200 -+++ xarchiver-0.5.2/src/window.c 2014-01-24 10:54:28.673636196 -0200 -@@ -26,7 +26,7 @@ - - extern GList *ArchiveType; - extern GList *ArchiveSuffix; --extern gboolean unrar; -+extern gboolean unar; - extern gboolean xdg_open; - extern Prefs_dialog_data *prefs_window; - extern Extract_dialog_data *extract_window; -@@ -1567,7 +1567,7 @@ - gtk_widget_show(selected_frame); - gtk_widget_set_sensitive(deselect_all,TRUE); - } -- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) -+ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) - { - gtk_widget_set_sensitive (delete_menu,FALSE); - gtk_widget_set_sensitive (rename_menu,FALSE); -@@ -1781,7 +1781,7 @@ - else - idx = xa_find_archive_index (current_page); - -- if (archive[idx]->type == XARCHIVETYPE_RAR && unrar) -+ if (archive[idx]->type == XARCHIVETYPE_RAR && unar) - { - response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); - return; diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch index 457fe80e5..0168f4e63 100644 --- a/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch +++ b/libre/xarchiver-libre/xarchiver-0.5.2-add_unar_support.patch @@ -70,7 +70,7 @@ diff -Nur xarchiver-0.5.2.orig/src/interface.c xarchiver-0.5.2/src/interface.c gtk_widget_set_sensitive (rename_menu,FALSE); diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c --- xarchiver-0.5.2.orig/src/main.c 2008-11-10 09:21:43.000000000 -0200 -+++ xarchiver-0.5.2/src/main.c 2014-01-24 10:59:39.108832843 -0200 ++++ xarchiver-0.5.2/src/main.c 2014-01-24 12:18:53.211684553 -0200 @@ -33,7 +33,7 @@ gchar *add_files; gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; @@ -80,7 +80,31 @@ diff -Nur xarchiver-0.5.2.orig/src/main.c xarchiver-0.5.2/src/main.c gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; int response; extern gchar *current_open_directory; -@@ -410,24 +410,14 @@ +@@ -312,7 +312,6 @@ + delete[XARCHIVETYPE_GZIP] = 0; + delete[XARCHIVETYPE_LZMA] = 0; + delete[XARCHIVETYPE_XZ] = 0; +- delete[XARCHIVETYPE_RAR] = &xa_rar_delete; + delete[XARCHIVETYPE_RPM] = 0; + delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete; + delete[XARCHIVETYPE_ZIP] = &xa_zip_delete; +@@ -325,7 +324,6 @@ + add[XARCHIVETYPE_ARJ] = &xa_arj_add; + add[XARCHIVETYPE_DEB] = 0; + add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = &xa_tar_add; +- add[XARCHIVETYPE_RAR] = &xa_rar_add; + add[XARCHIVETYPE_RPM] = 0; + add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add; + add[XARCHIVETYPE_ZIP] = &xa_zip_add; +@@ -348,7 +346,6 @@ + test[XARCHIVETYPE_7ZIP] = &xa_7zip_test; + test[XARCHIVETYPE_ARJ] = &xa_arj_test; + test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = 0; +- test[XARCHIVETYPE_RAR] = &xa_rar_test; + test[XARCHIVETYPE_RPM] = 0; + test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = 0; + test[XARCHIVETYPE_ZIP] = &xa_zip_test; +@@ -420,24 +417,14 @@ //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); } @@ -143,7 +167,7 @@ diff -Nur xarchiver-0.5.2.orig/src/pref_dialog.c xarchiver-0.5.2/src/pref_dialog gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c --- xarchiver-0.5.2.orig/src/rar.c 2008-11-10 06:05:07.000000000 -0200 -+++ xarchiver-0.5.2/src/rar.c 2014-01-24 10:50:11.672526720 -0200 ++++ xarchiver-0.5.2/src/rar.c 2014-01-24 13:09:12.838038687 -0200 @@ -20,7 +20,7 @@ #include "rar.h" #include @@ -248,7 +272,7 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c gboolean xa_rar_extract(XArchive *archive,GSList *files) { gchar *rar, *command, *e_filename = NULL; -@@ -295,10 +221,8 @@ +@@ -295,10 +221,7 @@ gboolean result = FALSE; _files = files; @@ -256,34 +280,36 @@ diff -Nur xarchiver-0.5.2.orig/src/rar.c xarchiver-0.5.2/src/rar.c - rar = "unrar"; - else - rar = "rar"; -+ (unar) -+ rar = "unar"; ++ rar = "unar"; while (_files) { -@@ -311,17 +235,13 @@ +@@ -311,42 +234,16 @@ g_slist_free(_files); if (archive->passwd != NULL) - command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", - archive->freshen ? "-f " : "" , archive->update ? "-u " : "", -+ command = g_strconcat (rar," ",archive->full_path ? "-q ", - " -p",archive->passwd, +- " -p",archive->passwd, - archive->overwrite ? " -o+" : " -o-", - " -idp ", -+ archive->overwrite ? " -f", - archive->escaped_path,names->str," ",archive->extraction_path , NULL ); - else +- archive->escaped_path,names->str," ",archive->extraction_path , NULL ); +- else - command = g_strconcat (rar," ",archive->full_path ? "x " : "e ", - archive->freshen ? "-f " : "" , archive->update ? "-u " : "", - archive->overwrite ? "-o+" : "-o-", - " -idp ", -+ command = g_strconcat (rar," ",archive->full_path ? "-q ", -+ archive->overwrite ? " -f", - archive->escaped_path,names->str," ",archive->extraction_path , NULL ); +- archive->escaped_path,names->str," ",archive->extraction_path , NULL ); ++ command = g_strconcat (rar," -p",archive->passwd, ++ archive->overwrite ? " -f" : "" , ++ archive->escaped_path,names->str," ",archive->extraction_path , NULL ); ++ else ++ command = g_strconcat (rar," ", ++ archive->overwrite ? " -f" : "" , ++ archive->escaped_path,names->str," ",archive->extraction_path , NULL ); g_string_free(names,TRUE); list = g_slist_append(list,command); -@@ -329,24 +249,3 @@ + result = xa_run_command (archive,list); return result; } @@ -338,8 +364,8 @@ diff -Nur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c gtk_widget_show(selected_frame); gtk_widget_set_sensitive(deselect_all,TRUE); } -- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) -+ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP) +- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) ++ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) { gtk_widget_set_sensitive (delete_menu,FALSE); gtk_widget_set_sensitive (rename_menu,FALSE); -- cgit v1.2.3 From d833c1e6ff43729957fb2f207f34a2db4e3615f7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 24 Jan 2014 16:44:06 -0200 Subject: calibre-libre-1.21.0-1: updating version --- libre/calibre-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 03dd3e20d..6c4cf6beb 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104517 2014-01-22 08:38:23Z jelle $ +# $Id: PKGBUILD 104707 2014-01-24 17:26:20Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -9,8 +9,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.20.0 -pkgrel=3 +pkgver=1.21.0 +pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('463cdfaa008a2aa16343876b77ae4e17' +md5sums=('f8588ca195354692d172d9fa3fd67dea' '95ca4eb3afa7c737c8371708a23bdad9' '675cd87d41342119827ef706055491e7') -- cgit v1.2.3 From fc13dbc09aac85038e8297d3b901cd33bc49d01d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 26 Jan 2014 18:14:14 -0200 Subject: kdebase-runtime-libre-4.12.1-2: rebuild for exiv2 --- libre/kdebase-runtime-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 98ad31071..6ae82841a 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203694 2014-01-14 07:35:16Z svenstaro $ +# $Id: PKGBUILD 204616 2014-01-24 10:54:17Z andyrtr $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' -- cgit v1.2.3 From e86b5b6478d67421e9b8c5c07b5d7aeaf948a0e7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 26 Jan 2014 18:32:02 -0200 Subject: linux-libre-3.12.9-1: updating version --- libre/linux-libre/PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7d32cd7ad..71aa58c6a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ +# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=8 +_sublevel=9 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.8 # nearly always the same as pkgver @@ -38,7 +38,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '392f920129940c4f83c7d204468213f3' + '348975e36e4dd27f5d8fc50e92de8922' '568ce15a9df133072489cbac8c4fefb3' '772873c548059c57c8ec7898f35c0e2b' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -76,6 +76,9 @@ prepare() { # fix issue on Hal8188EFWImg_CE.c deblobbed file sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # 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 From 8e4c1b534edef301389b636be34b729a9a2d8ff3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 26 Jan 2014 18:53:15 -0200 Subject: linux-libre: fix english orthography on PKGBUILD --- 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 71aa58c6a..33467a52b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -88,7 +88,7 @@ prepare() { # patch from fedora patch -Np1 -i "${srcdir}/criu-no-expert.patch" - # fix 15 seocnds nfs delay + # fix 15 seconds nfs delay patch -Np1 -i "${srcdir}/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch" patch -Np1 -i "${srcdir}/sunrpc-replace-gssd_running-with-more-reliable-check.patch" patch -Np1 -i "${srcdir}/nfs-check-gssd-running-before-krb5i-auth.patch" -- cgit v1.2.3 From 239170b83493da6dbc75d11901ce7080b7fb0a75 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 28 Jan 2014 00:28:10 -0200 Subject: qupzilla-libre-1.6.1-1: updating version --- libre/qupzilla-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index 15446d91b..c04e8643e 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103292 2014-01-02 18:15:35Z speps $ +# $Id: PKGBUILD 104845 2014-01-27 14:16:51Z speps $ # Maintainer: speps # Maintainer (Parabola): André Silva _pkgbase=qupzilla pkgbase=qupzilla-libre pkgname=(qupzilla-libre qupzilla-libre-qt5) -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" @@ -18,7 +18,7 @@ source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/ 'start.html.sed') noextract=("$_pkgbase-$pkgver.tar.gz") install="$_pkgbase.install" -md5sums=('2988c3afbef2612fd4acdb78ebb1fc35' +md5sums=('ca6fee487c9871d37d2dd09b3617b88f' '1d926e97a5b287d40fb695f6516f2a06' '0f166fa102af975b3b8ac030d477e9b8' '77120a0c39ba8254e5b2c273910f029a') -- cgit v1.2.3 From ff20daee848f9db4cd9a620f8798a9442468e744 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 28 Jan 2014 12:45:16 -0200 Subject: vim-runtime-7.4.135-2: ruby rebuild --- libre/vim-runtime/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD index ac2bcb58b..189d67c6b 100644 --- a/libre/vim-runtime/PKGBUILD +++ b/libre/vim-runtime/PKGBUILD @@ -12,7 +12,7 @@ _patchlevel=135 __hgrev=de28b1568fc2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" -- cgit v1.2.3 From aa34f2939f326250d0b3724d58063f284e17c0fc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 28 Jan 2014 12:48:35 -0200 Subject: linux-libre-3.12.9-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 33467a52b..5b4d785d4 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.12 _sublevel=9 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -53,7 +53,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '0569e96c071703cc244f1ea7ee87d40a') + '9cdff00e5aa53962869857d64a1ccf01') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3 From 599582124d081f052867baa6bbfe5c84c1edd072 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 28 Jan 2014 13:05:42 -0200 Subject: linux-libre-lts-3.10.28-1: updating version --- libre/linux-libre-lts/PKGBUILD | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 685d70501..79265fad1 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204271 2014-01-16 08:13:43Z bpiotrowski $ +# $Id: PKGBUILD 204715 2014-01-25 20:46:36Z andyrtr $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=27 +_sublevel=28 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.27 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.28 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '20d0ea2ae02745d7a525126a3b8a5ce7' + '1eeedf694bd64b34a031ac27549bc7a3' '85ce008eaacbb2fc54b81116d35cf946' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '7e5b9d817f296a7e305f2262a00b9fb3') + 'cec0d90f5d3fae8752b0020c6b785954') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -61,6 +61,9 @@ prepare() { # add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # 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) @@ -186,7 +189,7 @@ _package() { cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}" cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}" else - cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}" + cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" fi # add vmlinux @@ -271,16 +274,16 @@ _package-headers() { # copy arch includes for external modules mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}" - cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a arch/${KARCH}/include "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" # copy files necessary for later builds cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" if [ "$CARCH" = "mips64el" ]; then - cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" + cp arch/${KARCH}/Kbuild "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a arch/${KARCH}/loongson "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" fi # fix permissions on scripts dir -- cgit v1.2.3 From c4f402a50ec2af80e2c0ac5cca43058b21f6ec92 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 00:54:19 -0200 Subject: rename midori-gtk3-libre to midori-libre-gtk3 --- libre/midori-gtk3-libre/PKGBUILD | 66 ---------------------------------- libre/midori-gtk3-libre/midori.install | 14 -------- libre/midori-libre-gtk3/PKGBUILD | 66 ++++++++++++++++++++++++++++++++++ libre/midori-libre-gtk3/midori.install | 14 ++++++++ 4 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 libre/midori-gtk3-libre/PKGBUILD delete mode 100644 libre/midori-gtk3-libre/midori.install create mode 100644 libre/midori-libre-gtk3/PKGBUILD create mode 100644 libre/midori-libre-gtk3/midori.install (limited to 'libre') diff --git a/libre/midori-gtk3-libre/PKGBUILD b/libre/midori-gtk3-libre/PKGBUILD deleted file mode 100644 index 9d6fc881b..000000000 --- a/libre/midori-gtk3-libre/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 104163 2014-01-16 14:14:27Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Bartłomiej Piotrowski -# Contributor: Andreas Radke -# Contributor: rabyte -# Contributor: Johannes Krampf -# Contributor: Bartłomiej Piotrowski -# Maintainer (Parabola): André Silva - -_pkgname=midori-gtk3 -pkgname=midori-gtk3-libre -pkgver=0.5.7 -pkgrel=1 -pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' -arch=('x86_64' 'i686') -url='http://www.midori-browser.org/' -license=('LGPL2.1') -install='midori.install' -replaces=$_pkgname -conflicts=('midori' "$_pkgname") -provides=('midori' "$_pkgname=$pkgver") -depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') -makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake') -optdepends=('gst-plugins-base: HTML5 OGG videos support' - 'gst-plugins-good: HTML5 H264 and WebM videos support' - 'gst-libav: HTML5 H264 videos support' - 'aria2: download utility') -options=('!emptydirs') -source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2") -sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d') - -prepare() { - cd "${_pkgname/-gtk3}-$pkgver" - - # remove non-privacy search providers - sed -i 's|Duck Duck Go|DuckDuckGo HTML| - s|duckduckgo[.]com|duckduckgo.com/html| - \|Yahoo|d - \|name=Yahoo|d - \|text=Yahoo Web Search|d - \|uri=http://search[.]yahoo[.]com/search?p=|d - \|token=y|d - \|Google|d - \|name=Google|d - \|text=Web Search|d - \|uri=http://www[.]google[.]com/search?q=%s|d - \|token=g|d - \|Localize text or URL|d - \|translate[.]google[.]com/?q=|d - ' config/search -} - -build() { - cd "${_pkgname/-gtk3}-$pkgver" - - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DUSE_GTK3=1 - make -} - -package() { - make -C "${_pkgname/-gtk3}-$pkgver/build" DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori-gtk3-libre/midori.install b/libre/midori-gtk3-libre/midori.install deleted file mode 100644 index e6af79c5f..000000000 --- a/libre/midori-gtk3-libre/midori.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori-libre-gtk3/PKGBUILD b/libre/midori-libre-gtk3/PKGBUILD new file mode 100644 index 000000000..e51c10605 --- /dev/null +++ b/libre/midori-libre-gtk3/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 104163 2014-01-16 14:14:27Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Bartłomiej Piotrowski +# Contributor: Andreas Radke +# Contributor: rabyte +# Contributor: Johannes Krampf +# Contributor: Bartłomiej Piotrowski +# Maintainer (Parabola): André Silva + +_pkgname=midori-gtk3 +pkgname=midori-libre-gtk3 +pkgver=0.5.7 +pkgrel=1.1 +pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' +arch=('x86_64' 'i686' 'mips64el') +url='http://www.midori-browser.org/' +license=('LGPL2.1') +install='midori.install' +replaces=("$_pkgname-libre" "$_pkgname") +conflicts=('midori' "$_pkgname-libre" "$_pkgname") +provides=('midori' "$_pkgname-libre" "$_pkgname=$pkgver") +depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') +makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake') +optdepends=('gst-plugins-base: HTML5 OGG videos support' + 'gst-plugins-good: HTML5 H264 and WebM videos support' + 'gst-libav: HTML5 H264 videos support' + 'aria2: download utility') +options=('!emptydirs') +source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2") +sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d') + +prepare() { + cd "${_pkgname/-gtk3}-$pkgver" + + # remove non-privacy search providers + sed -i 's|Duck Duck Go|DuckDuckGo HTML| + s|duckduckgo[.]com|duckduckgo.com/html| + \|Yahoo|d + \|name=Yahoo|d + \|text=Yahoo Web Search|d + \|uri=http://search[.]yahoo[.]com/search?p=|d + \|token=y|d + \|Google|d + \|name=Google|d + \|text=Web Search|d + \|uri=http://www[.]google[.]com/search?q=%s|d + \|token=g|d + \|Localize text or URL|d + \|translate[.]google[.]com/?q=|d + ' config/search +} + +build() { + cd "${_pkgname/-gtk3}-$pkgver" + + mkdir -p build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DUSE_GTK3=1 + make +} + +package() { + make -C "${_pkgname/-gtk3}-$pkgver/build" DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/midori-libre-gtk3/midori.install b/libre/midori-libre-gtk3/midori.install new file mode 100644 index 000000000..e6af79c5f --- /dev/null +++ b/libre/midori-libre-gtk3/midori.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From c114cce38c84b80b99a63e50ee72c3355ad074cf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 00:56:46 -0200 Subject: doublecmd-libre: fix replaces, conflicts and provides --- libre/doublecmd-libre/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libre') diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index c08273344..7090abe6d 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') pkgver=0.5.8 _helpver=0.5.5 -pkgrel=1 +pkgrel=1.1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -48,9 +48,9 @@ build() { package_doublecmd-libre-gtk2() { pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation" depends=('gtk2') - conflicts=('doublecmd-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') - replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') - provides=("doublecmd-gtk2=${pkgver}") + conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2-libre' 'doublecmd-gtk2') + replaces=('doublecmd-gtk2-libre' 'doublecmd-gtk2') + provides=('doublecmd-gtk2-libre' "doublecmd-gtk2=${pkgver}") cd "$srcdir/$_pkgbase-gtk" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" @@ -63,9 +63,9 @@ package_doublecmd-libre-gtk2() { package_doublecmd-libre-qt() { pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation" depends=('qt4pas') - conflicts=('doublecmd-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') - replaces=('doublecmd-qt' 'doublecmd-qt-libre') - provides=("doublecmd-qt=${pkgver}") + conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt-libre' 'doublecmd-qt') + replaces=('doublecmd-qt-libre' 'doublecmd-qt') + provides=('doublecmd-qt-libre' "doublecmd-qt=${pkgver}") cd "$srcdir/$_pkgbase-qt" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" -- cgit v1.2.3 From 2a8492f4caca50bea82ef509c2090187477f67bf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 00:57:24 -0200 Subject: qupzilla-libre: fix replaces, conflicts and provides --- libre/qupzilla-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index c04e8643e..3d23a89f8 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -73,8 +73,8 @@ package_qupzilla-libre() { package_qupzilla-libre-qt5() { pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') - provides=("qupzilla-qt5=$pkgver" 'qupzilla-libre') - conflicts=('qupzilla-qt5' 'qupzilla-libre') + provides=('qupzilla-libre' "qupzilla-qt5=$pkgver") + conflicts=('qupzilla-libre' 'qupzilla-qt5') replaces=qupzilla-qt5 cd qt5 -- cgit v1.2.3 From a53e1b3916418245cf2d713c657bde83d1ed4f18 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 00:58:30 -0200 Subject: abiword-libre: add description on abiword-libre-plugins --- libre/abiword-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index d3ab71fff..301ffd497 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=3.0.0 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://www.abisource.com' @@ -79,7 +79,7 @@ package_abiword-libre() { } package_abiword-libre-plugins() { - pkgdesc='Additional plugins for Abiword' + pkgdesc='Additional plugins for Abiword, without nonfree fonts support' depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv') conflicts=('abiword-plugins') -- cgit v1.2.3 From 1d9352ee0c2007e7be377bffc91063c1b2b6eb10 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 02:23:03 -0200 Subject: doublecmd-libre: ordering on replaces, conflicts and provides --- libre/doublecmd-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 7090abe6d..797bbdfc2 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -48,9 +48,9 @@ build() { package_doublecmd-libre-gtk2() { pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation" depends=('gtk2') - conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2-libre' 'doublecmd-gtk2') - replaces=('doublecmd-gtk2-libre' 'doublecmd-gtk2') - provides=('doublecmd-gtk2-libre' "doublecmd-gtk2=${pkgver}") + conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') + replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') + provides=("doublecmd-gtk2=${pkgver}" 'doublecmd-gtk2-libre') cd "$srcdir/$_pkgbase-gtk" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" @@ -63,9 +63,9 @@ package_doublecmd-libre-gtk2() { package_doublecmd-libre-qt() { pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation" depends=('qt4pas') - conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt-libre' 'doublecmd-qt') - replaces=('doublecmd-qt-libre' 'doublecmd-qt') - provides=('doublecmd-qt-libre' "doublecmd-qt=${pkgver}") + conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') + replaces=('doublecmd-qt' 'doublecmd-qt-libre') + provides=("doublecmd-qt=${pkgver}" 'doublecmd-qt-libre') cd "$srcdir/$_pkgbase-qt" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" -- cgit v1.2.3 From ddbe6c700eeb9f498e6139dea52790e7230d6298 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 02:27:31 -0200 Subject: midori-libre-gtk3: rename midori to midori-libre and ordering on replaces, conflicts and provides --- libre/midori-libre-gtk3/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/midori-libre-gtk3/PKGBUILD b/libre/midori-libre-gtk3/PKGBUILD index e51c10605..255bc9ac3 100644 --- a/libre/midori-libre-gtk3/PKGBUILD +++ b/libre/midori-libre-gtk3/PKGBUILD @@ -16,9 +16,9 @@ arch=('x86_64' 'i686' 'mips64el') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' -replaces=("$_pkgname-libre" "$_pkgname") -conflicts=('midori' "$_pkgname-libre" "$_pkgname") -provides=('midori' "$_pkgname-libre" "$_pkgname=$pkgver") +replaces=("$_pkgname" "$_pkgname-libre") +conflicts=('midori-libre' "$_pkgname" "$_pkgname-libre") +provides=('midori-libre' "$_pkgname=$pkgver" "$_pkgname-libre") depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake') optdepends=('gst-plugins-base: HTML5 OGG videos support' -- cgit v1.2.3 From 8b85ec0809bd8188280cd24cd50607c77d5e68c2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 19:28:22 -0200 Subject: pacman-4.1.2-5.1: add [libre-multilib] and [libre-multilib-testing] on pacman.conf.x86_64 --- libre/pacman/PKGBUILD | 4 ++-- libre/pacman/pacman.conf.x86_64 | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 19ffa5992..a367f0c76 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pacman pkgver=4.1.2 -pkgrel=5 +pkgrel=5.1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -28,7 +28,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} md5sums=('063c8b0ff6bdf903dc235445525627cd' 'SKIP' '688feb0a552f42643a76f72e7198bfe4' - '765858b55d2112d948932fc645ea538b' + '77c5fd379e73cf86fc08a4bd5c4b1ba1' '9e0c64937ef751ae4273fa4d73381484' 'f0f310df411f943dbc4e2dd376c88662') diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 5729b60c5..03a8cf3a6 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -90,7 +90,13 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. +# enable the libre-multilib and multilib repositories as required here. + +#[libre-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib] +#Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -- cgit v1.2.3 From 7f584677fc99d77beced5dec9634731ef0d6805c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 30 Jan 2014 00:04:40 -0200 Subject: move lib32-{libclc-svn,{mesa-demos,sdl}-libre} from [libre] to [libre-multilib] --- libre-multilib/lib32-libclc-svn/PKGBUILD | 41 ++ libre-multilib/lib32-mesa-demos-libre/PKGBUILD | 46 ++ .../lib32-mesa-demos-libre/mesa-demos-libre.patch | 114 ++++ libre-multilib/lib32-sdl-libre/PKGBUILD | 57 ++ .../lib32-sdl-libre/fix_joystick_misc_axes.diff | 13 + libre-multilib/lib32-sdl-libre/libre.patch | 578 +++++++++++++++++++++ .../lib32-sdl-libre/libsdl-1.2.15-resizing.patch | 63 +++ .../lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch | 13 + .../sdl-1.2.14-fix-mouse-clicking.patch | 23 + libre/lib32-libclc-svn/PKGBUILD | 41 -- libre/lib32-mesa-demos-libre/PKGBUILD | 46 -- .../lib32-mesa-demos-libre/mesa-demos-libre.patch | 114 ---- libre/lib32-sdl-libre/PKGBUILD | 57 -- libre/lib32-sdl-libre/fix_joystick_misc_axes.diff | 13 - libre/lib32-sdl-libre/libre.patch | 578 --------------------- libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch | 63 --- libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch | 13 - .../sdl-1.2.14-fix-mouse-clicking.patch | 23 - 18 files changed, 948 insertions(+), 948 deletions(-) create mode 100644 libre-multilib/lib32-libclc-svn/PKGBUILD create mode 100644 libre-multilib/lib32-mesa-demos-libre/PKGBUILD create mode 100644 libre-multilib/lib32-mesa-demos-libre/mesa-demos-libre.patch create mode 100644 libre-multilib/lib32-sdl-libre/PKGBUILD create mode 100644 libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff create mode 100644 libre-multilib/lib32-sdl-libre/libre.patch create mode 100644 libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch create mode 100644 libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch create mode 100644 libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch delete mode 100644 libre/lib32-libclc-svn/PKGBUILD delete mode 100644 libre/lib32-mesa-demos-libre/PKGBUILD delete mode 100644 libre/lib32-mesa-demos-libre/mesa-demos-libre.patch delete mode 100644 libre/lib32-sdl-libre/PKGBUILD delete mode 100644 libre/lib32-sdl-libre/fix_joystick_misc_axes.diff delete mode 100644 libre/lib32-sdl-libre/libre.patch delete mode 100644 libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch delete mode 100644 libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch delete mode 100644 libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch (limited to 'libre') diff --git a/libre-multilib/lib32-libclc-svn/PKGBUILD b/libre-multilib/lib32-libclc-svn/PKGBUILD new file mode 100644 index 000000000..c1c7e021c --- /dev/null +++ b/libre-multilib/lib32-libclc-svn/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Márcio Silva + +_pkgname=libclc +pkgname=lib32-$_pkgname-svn +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=2 +arch=x86_64 +pkgdesc='Library requirements of the OpenCL C programming language (32-bit)' +url=http://libclc.llvm.org/ +license=MIT +depends=(lib32-llvm-libs libclc-svn) +makedepends=(clang lib32-llvm python2 svn) +provides=(lib32-$_pkgname) +conflicts=lib32-$_pkgname +source=$_pkgname::svn+http://llvm.org/svn/llvm-project/libclc/trunk +sha512sums=SKIP + +prepare() { + sed -i 's|/usr/bin/python|/usr/bin/python2|g; + ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + + cd $srcdir/$_pkgname + ./configure.py --prefix=/usr\ + --libexecdir=/usr/lib32/clc\ + --pkgconfigdir=/usr/lib32/pkgconfig\ + --with-llvm-config=/usr/bin/llvm-config32 + make +} + +package() { + cd $srcdir/$_pkgname + make DESTDIR=$pkgdir install + install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE + msg 'remove useless include dir' + rm -vrf $pkgdir/usr/include +} diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD new file mode 100644 index 000000000..83557c0a9 --- /dev/null +++ b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 94584 2013-07-27 15:01:38Z lcarlier $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke +# Maintainer (Parabola): André Silva + +_pkgbasename=mesa-demos-libre +pkgname=lib32-$_pkgbasename +pkgver=8.1.0 +pkgrel=3 +arch=(x86_64) +pkgdesc="Mesa demos and tools (32-bit), without nonfree demos" +url="http://mesa3d.sourceforge.net" +license=('custom') +provides=("lib32-mesa-demos=$pkgver") +replaces=('lib32-mesa-demos') +conflicts=('lib32-mesa-demos') +makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew') +source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2) +md5sums=('18225619a97e6900afd2b48a89dcbd4e') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/mesa-demos-${pkgver}" + ./configure --prefix=/usr + + make +} + +package() { + depends=('lib32-glew' mesa-demos-libre) + + cd "${srcdir}/mesa-demos-${pkgver}" + make DESTDIR="${pkgdir}" install + + for i in "$pkgdir/usr/bin/"*; do + mv "$i" "$i"32 + done + + rm -r "$pkgdir/usr/share/mesa-demos" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos" +} diff --git a/libre-multilib/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre-multilib/lib32-mesa-demos-libre/mesa-demos-libre.patch new file mode 100644 index 000000000..d630f373c --- /dev/null +++ b/libre-multilib/lib32-mesa-demos-libre/mesa-demos-libre.patch @@ -0,0 +1,114 @@ +diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am +--- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200 ++++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200 +@@ -65,7 +65,6 @@ + multiarb \ + paltex \ + pixeltest \ +- pointblast \ + projtex \ + ray \ + readpix \ +@@ -74,7 +73,6 @@ + shadowtex \ + singlebuffer \ + spectex \ +- spriteblast \ + stex3d \ + teapot \ + terrain \ +diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in +--- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200 ++++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200 +@@ -90,11 +90,11 @@ + @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ + @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ + @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \ + @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ + @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ + @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \ + @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \ + @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \ + @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \ +@@ -219,9 +219,6 @@ + pixeltest_SOURCES = pixeltest.c + pixeltest_OBJECTS = pixeltest.$(OBJEXT) + pixeltest_LDADD = $(LDADD) +-pointblast_SOURCES = pointblast.c +-pointblast_OBJECTS = pointblast.$(OBJEXT) +-pointblast_LDADD = $(LDADD) + projtex_SOURCES = projtex.c + projtex_OBJECTS = projtex.$(OBJEXT) + projtex_DEPENDENCIES = ../util/libutil.la +@@ -246,9 +243,6 @@ + spectex_SOURCES = spectex.c + spectex_OBJECTS = spectex.$(OBJEXT) + spectex_LDADD = $(LDADD) +-spriteblast_SOURCES = spriteblast.c +-spriteblast_OBJECTS = spriteblast.$(OBJEXT) +-spriteblast_LDADD = $(LDADD) + stex3d_SOURCES = stex3d.c + stex3d_OBJECTS = stex3d.$(OBJEXT) + stex3d_LDADD = $(LDADD) +@@ -325,8 +319,8 @@ + fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ + gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ + ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ +- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ +- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ ++ pixeltest.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c \ + stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ + textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ + winpos.c +@@ -336,8 +330,8 @@ + fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ + gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ + ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ +- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ +- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ ++ pixeltest.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c \ + stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ + textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ + winpos.c +@@ -722,9 +716,6 @@ + pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) + @rm -f pixeltest$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS) +-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) +- @rm -f pointblast$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) + projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) + @rm -f projtex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) +@@ -749,9 +740,6 @@ + spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) + @rm -f spectex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) +-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) +- @rm -f spriteblast$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) + stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) + @rm -f stex3d$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) +@@ -828,7 +816,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ +@@ -837,7 +824,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ diff --git a/libre-multilib/lib32-sdl-libre/PKGBUILD b/libre-multilib/lib32-sdl-libre/PKGBUILD new file mode 100644 index 000000000..0488381ea --- /dev/null +++ b/libre-multilib/lib32-sdl-libre/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae +# Contributor: dorphell +# Maintainer (Parabola): André Silva + +_pkgbasename=sdl-libre +pkgname=lib32-$_pkgbasename +pkgver=1.2.15 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file" +arch=('x86_64') +url="http://www.libsdl.org" +license=('LGPL') +provides=("lib32-sdl=${pkgver}") +conflicts=('lib32-sdl') +replaces=('lib32-sdl') +depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) +makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) +optdepends=('lib32-alsa-lib: ALSA audio driver' + 'lib32-libpulse: PulseAudio audio driver') +options=('!libtool') +source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz + sdl-1.2.14-fix-mouse-clicking.patch + sdl-1.2.14-disable-mmx.patch + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch) +md5sums=('c6e53ef16fa347ed066c3d68fe93c378' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'e5c16b7611f62c7cb25f0534eff68852' + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ + --with-x --disable-rpath --disable-static --libdir=/usr/lib32 + make +} + +package() { + cd SDL-$pkgver + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/{include,share} + + cd "$pkgdir/usr/bin" + mv sdl-config sdl-config-32 +} diff --git a/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff new file mode 100644 index 000000000..75e3755c9 --- /dev/null +++ b/libre-multilib/lib32-sdl-libre/fix_joystick_misc_axes.diff @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; iFifoFree >> 2; \ +- FifoFreeCount -= (cnt); \ +-} +-#endif /* __RIVA_HW_H__ */ +- +--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 ++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 +@@ -24,12 +24,10 @@ + #include "SDL_video.h" + #include "../SDL_blit.h" + #include "SDL_fbriva.h" +-#include "riva_mmio.h" + #include "riva_regs.h" + + + static int FifoEmptyCount = 0; +-static int FifoFreeCount = 0; + + /* Wait for vertical retrace */ + static void WaitVBL(_THIS) +@@ -41,20 +39,6 @@ + while ( !(*port & 0x08) ) + ; + } +-static void NV3WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) +- ; +-} +-static void NV4WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) +- ; +-} + + #if 0 /* Not yet implemented? */ + /* Sets video mem colorkey and accelerated blit function */ +@@ -74,7 +58,6 @@ + { + int dstX, dstY; + int dstW, dstH; +- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); + + /* Don't blit to the display surface when switched away */ + if ( switched_away ) { +@@ -93,13 +76,6 @@ + dstX += rect->x; + dstY += rect->y; + +- RIVA_FIFO_FREE(Bitmap, 1); +- Bitmap->Color1A = color; +- +- RIVA_FIFO_FREE(Bitmap, 2); +- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; +- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; +- + FB_AddBusySurface(dst); + + if ( dst == this->screen ) { +@@ -115,7 +91,6 @@ + int srcX, srcY; + int dstX, dstY; + int dstW, dstH; +- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); + + /* FIXME: For now, only blit to display surface */ + if ( dst->pitch != SDL_VideoSurface->pitch ) { +@@ -142,11 +117,6 @@ + dstX += dstrect->x; + dstY += dstrect->y; + +- RIVA_FIFO_FREE(Blt, 3); +- Blt->TopLeftSrc = (srcY << 16) | srcX; +- Blt->TopLeftDst = (dstY << 16) | dstX; +- Blt->WidthHeight = (dstH << 16) | dstW; +- + FB_AddBusySurface(src); + FB_AddBusySurface(dst); + +@@ -185,23 +155,15 @@ + + void FB_RivaAccel(_THIS, __u32 card) + { +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); + + /* We have hardware accelerated surface functions */ + this->CheckHWBlit = CheckHWBlit; + wait_vbl = WaitVBL; + switch (card) { +- case FB_ACCEL_NV3: +- wait_idle = NV3WaitIdle; +- break; +- case FB_ACCEL_NV4: +- wait_idle = NV4WaitIdle; +- break; + default: + /* Hmm... FIXME */ + break; + } +- FifoEmptyCount = Rop->FifoFree; + + /* The Riva has an accelerated color fill */ + this->info.blit_fill = 1; +--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 ++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 +@@ -46,7 +46,6 @@ + #include "SDL_fbevents_c.h" + #include "SDL_fb3dfx.h" + #include "SDL_fbmatrox.h" +-#include "SDL_fbriva.h" + + /*#define FBCON_DEBUG*/ + +@@ -769,13 +768,6 @@ + #endif + FB_3DfxAccel(this, finfo.accel); + break; +- case FB_ACCEL_NV3: +- case FB_ACCEL_NV4: +-#ifdef FBACCEL_DEBUG +- printf("NVidia hardware accelerator!\n"); +-#endif +- FB_RivaAccel(this, finfo.accel); +- break; + default: + #ifdef FBACCEL_DEBUG + printf("Unknown hardware accelerator.\n"); diff --git a/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/libre-multilib/lib32-sdl-libre/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 000000000..1bb6e0e47 --- /dev/null +++ b/libre-multilib/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, diff --git a/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch new file mode 100644 index 000000000..7d3e5acfc --- /dev/null +++ b/libre-multilib/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; + diff --git a/libre/lib32-libclc-svn/PKGBUILD b/libre/lib32-libclc-svn/PKGBUILD deleted file mode 100644 index c1c7e021c..000000000 --- a/libre/lib32-libclc-svn/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: Márcio Silva - -_pkgname=libclc -pkgname=lib32-$_pkgname-svn -pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=2 -arch=x86_64 -pkgdesc='Library requirements of the OpenCL C programming language (32-bit)' -url=http://libclc.llvm.org/ -license=MIT -depends=(lib32-llvm-libs libclc-svn) -makedepends=(clang lib32-llvm python2 svn) -provides=(lib32-$_pkgname) -conflicts=lib32-$_pkgname -source=$_pkgname::svn+http://llvm.org/svn/llvm-project/libclc/trunk -sha512sums=SKIP - -prepare() { - sed -i 's|/usr/bin/python|/usr/bin/python2|g; - ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - - cd $srcdir/$_pkgname - ./configure.py --prefix=/usr\ - --libexecdir=/usr/lib32/clc\ - --pkgconfigdir=/usr/lib32/pkgconfig\ - --with-llvm-config=/usr/bin/llvm-config32 - make -} - -package() { - cd $srcdir/$_pkgname - make DESTDIR=$pkgdir install - install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE - msg 'remove useless include dir' - rm -vrf $pkgdir/usr/include -} diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD deleted file mode 100644 index 83557c0a9..000000000 --- a/libre/lib32-mesa-demos-libre/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 94584 2013-07-27 15:01:38Z lcarlier $ -# Maintainer: Jan de Groot -# Maintainer: Andreas Radke -# Maintainer (Parabola): André Silva - -_pkgbasename=mesa-demos-libre -pkgname=lib32-$_pkgbasename -pkgver=8.1.0 -pkgrel=3 -arch=(x86_64) -pkgdesc="Mesa demos and tools (32-bit), without nonfree demos" -url="http://mesa3d.sourceforge.net" -license=('custom') -provides=("lib32-mesa-demos=$pkgver") -replaces=('lib32-mesa-demos') -conflicts=('lib32-mesa-demos') -makedepends=(gcc-multilib 'lib32-mesa' 'lib32-glew') -source=(https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2) -md5sums=('18225619a97e6900afd2b48a89dcbd4e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/mesa-demos-${pkgver}" - ./configure --prefix=/usr - - make -} - -package() { - depends=('lib32-glew' mesa-demos-libre) - - cd "${srcdir}/mesa-demos-${pkgver}" - make DESTDIR="${pkgdir}" install - - for i in "$pkgdir/usr/bin/"*; do - mv "$i" "$i"32 - done - - rm -r "$pkgdir/usr/share/mesa-demos" - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos" -} diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch deleted file mode 100644 index d630f373c..000000000 --- a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am ---- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200 -+++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200 -@@ -65,7 +65,6 @@ - multiarb \ - paltex \ - pixeltest \ -- pointblast \ - projtex \ - ray \ - readpix \ -@@ -74,7 +73,6 @@ - shadowtex \ - singlebuffer \ - spectex \ -- spriteblast \ - stex3d \ - teapot \ - terrain \ -diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in ---- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200 -+++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200 -@@ -90,11 +90,11 @@ - @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ - @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ - @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ --@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \ - @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ - @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ - @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ --@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \ -+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \ - @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \ - @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \ - @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \ -@@ -219,9 +219,6 @@ - pixeltest_SOURCES = pixeltest.c - pixeltest_OBJECTS = pixeltest.$(OBJEXT) - pixeltest_LDADD = $(LDADD) --pointblast_SOURCES = pointblast.c --pointblast_OBJECTS = pointblast.$(OBJEXT) --pointblast_LDADD = $(LDADD) - projtex_SOURCES = projtex.c - projtex_OBJECTS = projtex.$(OBJEXT) - projtex_DEPENDENCIES = ../util/libutil.la -@@ -246,9 +243,6 @@ - spectex_SOURCES = spectex.c - spectex_OBJECTS = spectex.$(OBJEXT) - spectex_LDADD = $(LDADD) --spriteblast_SOURCES = spriteblast.c --spriteblast_OBJECTS = spriteblast.$(OBJEXT) --spriteblast_LDADD = $(LDADD) - stex3d_SOURCES = stex3d.c - stex3d_OBJECTS = stex3d.$(OBJEXT) - stex3d_LDADD = $(LDADD) -@@ -325,8 +319,8 @@ - fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ - gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ - ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ -- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ -- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ -+ pixeltest.c projtex.c ray.c readpix.c reflect.c \ -+ renormal.c shadowtex.c singlebuffer.c spectex.c \ - stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ - textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ - winpos.c -@@ -336,8 +330,8 @@ - fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \ - gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \ - ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \ -- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \ -- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \ -+ pixeltest.c projtex.c ray.c readpix.c reflect.c \ -+ renormal.c shadowtex.c singlebuffer.c spectex.c \ - stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \ - textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \ - winpos.c -@@ -722,9 +716,6 @@ - pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) - @rm -f pixeltest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS) --pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) -- @rm -f pointblast$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) - projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) - @rm -f projtex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) -@@ -749,9 +740,6 @@ - spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) - @rm -f spectex$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) --spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) -- @rm -f spriteblast$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) - stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) - @rm -f stex3d$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) -@@ -828,7 +816,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ -@@ -837,7 +824,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD deleted file mode 100644 index 0488381ea..000000000 --- a/libre/lib32-sdl-libre/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Allan McRae -# Contributor: dorphell -# Maintainer (Parabola): André Silva - -_pkgbasename=sdl-libre -pkgname=lib32-$_pkgbasename -pkgver=1.2.15 -pkgrel=3 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit), without nonfree riva_mmio.h file" -arch=('x86_64') -url="http://www.libsdl.org" -license=('LGPL') -provides=("lib32-sdl=${pkgver}") -conflicts=('lib32-sdl') -replaces=('lib32-sdl') -depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) -optdepends=('lib32-alsa-lib: ALSA audio driver' - 'lib32-libpulse: PulseAudio audio driver') -options=('!libtool') -source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar.gz - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-disable-mmx.patch - fix_joystick_misc_axes.diff - libsdl-1.2.15-resizing.patch) -md5sums=('c6e53ef16fa347ed066c3d68fe93c378' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'e5c16b7611f62c7cb25f0534eff68852' - '687586a108b597a2a6b73070c1d37e51' - '3dd50347d8856160a9cbd7f80383a1f8') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd SDL-$pkgver - patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch - patch -Np1 -i ../fix_joystick_misc_axes.diff - patch -Np1 -i ../libsdl-1.2.15-resizing.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd SDL-$pkgver - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/{include,share} - - cd "$pkgdir/usr/bin" - mv sdl-config sdl-config-32 -} diff --git a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff deleted file mode 100644 index 75e3755c9..000000000 --- a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c -index ee43974..80e46e4 100644 ---- a/src/joystick/linux/SDL_sysjoystick.c -+++ b/src/joystick/linux/SDL_sysjoystick.c -@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) - ++joystick->nbuttons; - } - } -- for ( i=0; iFifoFree >> 2; \ -- FifoFreeCount -= (cnt); \ --} --#endif /* __RIVA_HW_H__ */ -- ---- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 -+++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 -@@ -24,12 +24,10 @@ - #include "SDL_video.h" - #include "../SDL_blit.h" - #include "SDL_fbriva.h" --#include "riva_mmio.h" - #include "riva_regs.h" - - - static int FifoEmptyCount = 0; --static int FifoFreeCount = 0; - - /* Wait for vertical retrace */ - static void WaitVBL(_THIS) -@@ -41,20 +39,6 @@ - while ( !(*port & 0x08) ) - ; - } --static void NV3WaitIdle(_THIS) --{ -- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); -- while ( (Rop->FifoFree < FifoEmptyCount) || -- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) -- ; --} --static void NV4WaitIdle(_THIS) --{ -- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); -- while ( (Rop->FifoFree < FifoEmptyCount) || -- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) -- ; --} - - #if 0 /* Not yet implemented? */ - /* Sets video mem colorkey and accelerated blit function */ -@@ -74,7 +58,6 @@ - { - int dstX, dstY; - int dstW, dstH; -- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); - - /* Don't blit to the display surface when switched away */ - if ( switched_away ) { -@@ -93,13 +76,6 @@ - dstX += rect->x; - dstY += rect->y; - -- RIVA_FIFO_FREE(Bitmap, 1); -- Bitmap->Color1A = color; -- -- RIVA_FIFO_FREE(Bitmap, 2); -- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; -- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; -- - FB_AddBusySurface(dst); - - if ( dst == this->screen ) { -@@ -115,7 +91,6 @@ - int srcX, srcY; - int dstX, dstY; - int dstW, dstH; -- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); - - /* FIXME: For now, only blit to display surface */ - if ( dst->pitch != SDL_VideoSurface->pitch ) { -@@ -142,11 +117,6 @@ - dstX += dstrect->x; - dstY += dstrect->y; - -- RIVA_FIFO_FREE(Blt, 3); -- Blt->TopLeftSrc = (srcY << 16) | srcX; -- Blt->TopLeftDst = (dstY << 16) | dstX; -- Blt->WidthHeight = (dstH << 16) | dstW; -- - FB_AddBusySurface(src); - FB_AddBusySurface(dst); - -@@ -185,23 +155,15 @@ - - void FB_RivaAccel(_THIS, __u32 card) - { -- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); - - /* We have hardware accelerated surface functions */ - this->CheckHWBlit = CheckHWBlit; - wait_vbl = WaitVBL; - switch (card) { -- case FB_ACCEL_NV3: -- wait_idle = NV3WaitIdle; -- break; -- case FB_ACCEL_NV4: -- wait_idle = NV4WaitIdle; -- break; - default: - /* Hmm... FIXME */ - break; - } -- FifoEmptyCount = Rop->FifoFree; - - /* The Riva has an accelerated color fill */ - this->info.blit_fill = 1; ---- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 -+++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 -@@ -46,7 +46,6 @@ - #include "SDL_fbevents_c.h" - #include "SDL_fb3dfx.h" - #include "SDL_fbmatrox.h" --#include "SDL_fbriva.h" - - /*#define FBCON_DEBUG*/ - -@@ -769,13 +768,6 @@ - #endif - FB_3DfxAccel(this, finfo.accel); - break; -- case FB_ACCEL_NV3: -- case FB_ACCEL_NV4: --#ifdef FBACCEL_DEBUG -- printf("NVidia hardware accelerator!\n"); --#endif -- FB_RivaAccel(this, finfo.accel); -- break; - default: - #ifdef FBACCEL_DEBUG - printf("Unknown hardware accelerator.\n"); diff --git a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch deleted file mode 100644 index 0655a13e1..000000000 --- a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Revert change that breaks window corner resizing - http://bugzilla.libsdl.org/show_bug.cgi?id=1430 -Author: Andrew Caudwell -Last-Update: 2012-04-10 -Bug-Debian: http://bugs.debian.org/665779 - -diff -r c787fb1b5699 src/video/x11/SDL_x11events.c ---- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 -@@ -57,12 +57,6 @@ - static SDLKey MISC_keymap[256]; - SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); - --/* -- Pending resize target for ConfigureNotify (so outdated events don't -- cause inappropriate resize events) --*/ --int X11_PendingConfigureNotifyWidth = -1; --int X11_PendingConfigureNotifyHeight = -1; - - #ifdef X_HAVE_UTF8_STRING - Uint32 Utf8ToUcs4(const Uint8 *utf8) -@@ -825,16 +819,6 @@ - #ifdef DEBUG_XEVENTS - printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); - #endif -- if ((X11_PendingConfigureNotifyWidth != -1) && -- (X11_PendingConfigureNotifyHeight != -1)) { -- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && -- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { -- /* Event is from before the resize, so ignore. */ -- break; -- } -- X11_PendingConfigureNotifyWidth = -1; -- X11_PendingConfigureNotifyHeight = -1; -- } - if ( SDL_VideoSurface ) { - if ((xevent.xconfigure.width != SDL_VideoSurface->w) || - (xevent.xconfigure.height != SDL_VideoSurface->h)) { -diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h ---- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 -@@ -27,8 +27,3 @@ - extern void X11_InitOSKeymap(_THIS); - extern void X11_PumpEvents(_THIS); - extern void X11_SetKeyboardState(Display *display, const char *key_vec); -- --/* Variables to be exported */ --extern int X11_PendingConfigureNotifyWidth; --extern int X11_PendingConfigureNotifyHeight; -- -diff -r c787fb1b5699 src/video/x11/SDL_x11video.c ---- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 -@@ -1182,8 +1182,6 @@ - current = NULL; - goto done; - } -- X11_PendingConfigureNotifyWidth = width; -- X11_PendingConfigureNotifyHeight = height; - } else { - if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { - current = NULL; diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch deleted file mode 100644 index 1bb6e0e47..000000000 --- a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch +++ /dev/null @@ -1,13 +0,0 @@ -# and another one from FS#26020 - ---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 -+++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 -@@ -89,6 +89,8 @@ - #include "SDL_yuvfuncs.h" - #include "SDL_yuv_sw_c.h" - -+#undef __OPTIMIZE__ -+ - /* The functions used to manipulate software video overlays */ - static struct private_yuvhwfuncs sw_yuvfuncs = { - SDL_LockYUV_SW, diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch deleted file mode 100644 index 7d3e5acfc..000000000 --- a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - -- cgit v1.2.3 From 94793e4e4c280497713baa606de85045cc0b5096 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 30 Jan 2014 19:38:45 -0200 Subject: mate-document-viewer-libre: add new package on [libre] --- libre/mate-document-viewer-libre/PKGBUILD | 51 ++++++++++++++++++++++ .../mate-document-viewer.install | 13 ++++++ 2 files changed, 64 insertions(+) create mode 100644 libre/mate-document-viewer-libre/PKGBUILD create mode 100644 libre/mate-document-viewer-libre/mate-document-viewer.install (limited to 'libre') diff --git a/libre/mate-document-viewer-libre/PKGBUILD b/libre/mate-document-viewer-libre/PKGBUILD new file mode 100644 index 000000000..6557d3469 --- /dev/null +++ b/libre/mate-document-viewer-libre/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer : Martin Wimpress + +_pkgname=mate-document-viewer +pkgname=mate-document-viewer-libre +pkgver=1.6.2 +pkgrel=1 +pkgdesc="Simply a document viewer, with libarchive recommendation" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm' + 'libspectre' 'mate-icon-theme' 'poppler-glib' 'zlib') +makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' + 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin') +optdepends=('djvulibre: DjVu support' + 'libgxps: XPS support' + 'mate-file-manager: Document Properties extension' + 'p7zip: cbz and cb7 compressed comic books' + 'texlive-bin: DVI support' + 'libarchive: cbr compressed comic books') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz") +sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997') +install=${_pkgname}.install + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${_pkgname} \ + --enable-gtk-doc \ + --enable-djvu \ + --enable-dvi \ + --enable-t1lib \ + --enable-pixbuf \ + --enable-comics \ + --enable-introspection \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s atril "${pkgdir}/usr/bin/mate-document-viewer" +} diff --git a/libre/mate-document-viewer-libre/mate-document-viewer.install b/libre/mate-document-viewer-libre/mate-document-viewer.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/libre/mate-document-viewer-libre/mate-document-viewer.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3 From c555329eea5e474f33aae58e493bd10ec69ae68a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 30 Jan 2014 19:39:10 -0200 Subject: mate-file-archiver-libre: add new package on [libre] --- libre/mate-file-archiver-libre/PKGBUILD | 51 ++++++++++++++++++ libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch | 60 ++++++++++++++++++++++ .../mate-file-archiver.install | 13 +++++ 3 files changed, 124 insertions(+) create mode 100644 libre/mate-file-archiver-libre/PKGBUILD create mode 100644 libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch create mode 100644 libre/mate-file-archiver-libre/mate-file-archiver.install (limited to 'libre') diff --git a/libre/mate-file-archiver-libre/PKGBUILD b/libre/mate-file-archiver-libre/PKGBUILD new file mode 100644 index 000000000..5072dd583 --- /dev/null +++ b/libre/mate-file-archiver-libre/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer : Martin Wimpress + +_pkgname=mate-file-archiver +pkgname=mate-file-archiver-libre +pkgver=1.6.1 +pkgrel=1 +pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' + 'mate-file-manager' 'tar') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +optdepends=('arj: for ARJ support' + 'p7zip: for 7zip support' + 'unar: for RAR extract support' + 'unzip: for ZIP extract support' + 'zip: for ZIP support') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz" + fr-rpm-bsdtar.patch) +sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a' + '219b05a979bf6f249aaae27964f02345fd81168d') +install=${_pkgname}.install + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # This patch 'depends' on libarchive + patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${_pkgname} \ + --disable-static \ + --disable-scrollkeeper \ + --disable-packagekit + mate-doc-prepare --force + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch b/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch new file mode 100644 index 000000000..93a783176 --- /dev/null +++ b/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch @@ -0,0 +1,60 @@ +This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio. +It is useful on systems that do not have cpio or RPM/YUM +This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives. + +------------------+ + rpm2cpio.c | 2 +- + fr-command-rpm.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: src/commands/rpm2cpio.c +================================ +--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31 ++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26 +@@ -128,7 +128,7 @@ + archive_command = "bzip2 -dc"; + fclose (stream); + +- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); ++ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); + + return system (command); + } +Index: src/fr-command-rpm.c +================================ +--- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31 ++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26 +@@ -175,7 +175,7 @@ + + fr_process_begin_command (comm->process, "sh"); + fr_process_add_arg (comm->process, "-c"); +- fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL); ++ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL); + fr_process_end_command (comm->process); + fr_process_start (comm->process); + } +@@ -200,7 +200,7 @@ + + cmd = g_string_new (PRIVEXECDIR "rpm2cpio "); + g_string_append (cmd, comm->e_filename); +- g_string_append (cmd, " -idu "); ++ g_string_append (cmd, " -xf - "); + for (scan = file_list; scan; scan = scan->next) { + char *filename = g_shell_quote (scan->data); + g_string_append (cmd, filename); +@@ -233,7 +233,7 @@ + FrCommandCap capabilities; + + capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; +- if (is_program_available ("cpio", check_command)) ++ if (is_program_available ("bsdtar", check_command)) + capabilities |= FR_COMMAND_CAN_READ; + + return capabilities; +@@ -244,7 +244,7 @@ + fr_command_rpm_get_packages (FrCommand *comm, + const char *mime_type) + { +- return PACKAGES ("cpio,rpm"); ++ return PACKAGES ("bsdtar,rpm"); + } diff --git a/libre/mate-file-archiver-libre/mate-file-archiver.install b/libre/mate-file-archiver-libre/mate-file-archiver.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/libre/mate-file-archiver-libre/mate-file-archiver.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3 From 537f9d5031b8bc5e9fa98ab5622dd58e49a8c4a2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 30 Jan 2014 22:05:53 -0200 Subject: move pcsx2-libre from [libre] to [libre-multilib] --- libre-multilib/pcsx2-libre/PKGBUILD | 57 +++++++++++++++++++++++++++++++++++++ libre/pcsx2-libre/PKGBUILD | 57 ------------------------------------- 2 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 libre-multilib/pcsx2-libre/PKGBUILD delete mode 100644 libre/pcsx2-libre/PKGBUILD (limited to 'libre') diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2-libre/PKGBUILD new file mode 100644 index 000000000..9331100aa --- /dev/null +++ b/libre-multilib/pcsx2-libre/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 103474 2014-01-06 14:09:29Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: josephgbr +# Contributor: vEX + +_pkgname=pcsx2 +pkgname=$_pkgname-libre +pkgver=1.1.0.r5797 +pkgrel=1 +pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' +arch=('i686' 'x86_64') +url='http://www.pcsx2.net' +license=('GPL') +makedepends=('cmake' 'sparsehash' 'svn') +if [[ $CARCH == "i686" ]]; then + depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8') +elif [[ $CARCH == "x86_64" ]]; then + makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') +fi +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=("$_pkgname") +options=('!emptydirs') +source=("${_pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r}") +sha256sums=('SKIP') + +build() { + cd ${_pkgname} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + if [[ $CARCH == "i686" ]]; then + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' + elif [[ $CARCH == "x86_64" ]]; then + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' + fi + + make +} + +package() { + cd ${_pkgname}/build + + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') + fi + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/libre/pcsx2-libre/PKGBUILD b/libre/pcsx2-libre/PKGBUILD deleted file mode 100644 index 9331100aa..000000000 --- a/libre/pcsx2-libre/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 103474 2014-01-06 14:09:29Z alucryd $ -# Maintainer: Maxime Gauduin -# Contributor: josephgbr -# Contributor: vEX - -_pkgname=pcsx2 -pkgname=$_pkgname-libre -pkgver=1.1.0.r5797 -pkgrel=1 -pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' -arch=('i686' 'x86_64') -url='http://www.pcsx2.net' -license=('GPL') -makedepends=('cmake' 'sparsehash' 'svn') -if [[ $CARCH == "i686" ]]; then - depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8') -elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') -fi -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") -options=('!emptydirs') -source=("${_pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r}") -sha256sums=('SKIP') - -build() { - cd ${_pkgname} - - if [[ -d build ]]; then - rm -rf build - fi - mkdir build && cd build - - if [[ $CARCH == "i686" ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' - elif [[ $CARCH == "x86_64" ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' - fi - - make -} - -package() { - cd ${_pkgname}/build - - if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') - fi - - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: -- cgit v1.2.3 From 6d29b472048fc40787e34579694ddfeb363719c6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 30 Jan 2014 22:45:27 -0200 Subject: remove ghostscript-libre and gnu-ghostscript because ghostscript does not contain nonfree files anymore => https://labs.parabola.nu/issues/480 --- libre/ghostscript-libre/PKGBUILD | 92 -------------------------------- libre/gnu-ghostscript/PKGBUILD | 89 ------------------------------ libre/gnu-ghostscript/ijs-automake.patch | 10 ---- libre/gnu-ghostscript/libtool.patch | 14 ----- 4 files changed, 205 deletions(-) delete mode 100644 libre/ghostscript-libre/PKGBUILD delete mode 100644 libre/gnu-ghostscript/PKGBUILD delete mode 100644 libre/gnu-ghostscript/ijs-automake.patch delete mode 100644 libre/gnu-ghostscript/libtool.patch (limited to 'libre') diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD deleted file mode 100644 index b16f322f2..000000000 --- a/libre/ghostscript-libre/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# $Id: PKGBUILD 204553 2014-01-22 13:37:42Z andyrtr $ -# Maintainer: AndyRTR -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Joshua Haase - -### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ### - -_pkgname=ghostscript -pkgname=ghostscript-libre -pkgver=9.10 -pkgrel=3 -pkgdesc="An interpreter for the PostScript language, without nonfree files" -arch=('i686' 'x86_64' 'mips64el') -license=('AGPL') #non free files removed -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') -makedepends=('gtk3' 'gnutls') -optdepends=('texlive-core: needed for dvipdf' - 'gtk3: needed for gsx') -conflicts=('ghostscript') -replaces=('ghostscript') -provides=("ghostscript=$pkgver") -url="http://www.ghostscript.com/" -mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) -source=(https://repo.parabolagnulinux.org/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2) -options=('!makeflags') -mkmd5sums=('7179bb1ed4f6f453147e6f7e1f210ce8') -md5sums=('c9f6ffec6a07e06caba394d7ebdbbe9a') - -mksource() { - cd ghostscript-${pkgver} - - # delete nonfree files - grep -l "are not altered" Resource/CMap/* | xargs rm -fv - grep -l "not be copied" Resource/CMap/* | xargs rm -fv -} - -build() { - cd ghostscript-${pkgver} - - # force it to use system-libs - # keep heavily patched included openjpeg, leads to segfault with system openjpeg - # https://bugs.archlinux.org/task/38226 - rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community - - ./configure --prefix=/usr \ - --enable-dynamic \ - --with-ijs \ - --with-jbig2dec \ - --with-omni \ - --with-x \ - --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --without-luratech \ - --without-omni \ - --with-system-libtiff \ - --with-libpaper \ - --disable-compile-inits #--help # needed for linking with system-zlib - make - - # Build IJS - cd ijs - sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac - ./autogen.sh - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ghostscript-${pkgver} - make DESTDIR="${pkgdir}" \ - cups_serverroot="${pkgdir}"/etc/cups \ - cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall - - # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/ - - install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE - - # remove unwanted localized man-pages - rm -rf "$pkgdir"/usr/share/man/[^man1]* - - # install IJS - cd ijs - make DESTDIR="${pkgdir}" install - - # remove filters that are now maintained in cups-filters as upstream home - rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} -} diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD deleted file mode 100644 index 817e6a418..000000000 --- a/libre/gnu-ghostscript/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# Maintainer: André Silva - -_pkgname=ghostscript -pkgname=gnu-ghostscript -_gspkgver=9.10 # ghostscript-libre package version -_pkgver=9.06 -pkgver=9.06.0 -pkgrel=7 -pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL3') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper') -makedepends=('gtk3' 'gnutls') -optdepends=('texlive-core: needed for dvipdf' - 'gtk3: needed for gsx') -conflicts=${_pkgname} -provides="${_pkgname}=${_gspkgver}" -url="https://www.gnu.org/software/${_pkgname}/" -source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz - ijs-automake.patch - libtool.patch) -options=('!makeflags') -md5sums=('85a5e07a6b91937c157576293b381065' - '83bcae456ad4c9fb790be483914dbeba' - '5bd5d4966007b460deed866a30a0b3c8') - -build() { - cd ${pkgname}-${pkgver} - - # fix build with recent automake - patch -p1 -i "$srcdir/ijs-automake.patch" - - # fix libtool version - patch -Np1 -i ${srcdir}/libtool.patch - - # force it to use system-libs - # keep heavily patched included openjpeg, leads to segfault with system openjpeg - # https://bugs.archlinux.org/task/38226 - rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community - - ./configure --prefix=/usr \ - --enable-dynamic \ - --with-ijs \ - --with-jbig2dec \ - --with-omni \ - --with-x \ - --with-drivers=ALL\ - --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --without-luratech \ - --without-omni \ - --with-system-libtiff \ - --with-libpaper \ - --disable-compile-inits #--help # needed for linking with system-zlib - make - - # Build IJS - cd ijs - sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac - ./autogen.sh - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" \ - cups_serverroot="${pkgdir}"/etc/cups \ - cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall - - # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 "${srcdir}"/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/${_pkgname}/$_pkgver/doc/ - - mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname} - install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/ - - # remove unwanted localized man-pages - rm -rf "$pkgdir"/usr/share/man/[^man1]* - - # install IJS - cd ijs - make DESTDIR="${pkgdir}" install - - # remove filters that are now maintained in cups-filters as upstream home - rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} -} diff --git a/libre/gnu-ghostscript/ijs-automake.patch b/libre/gnu-ghostscript/ijs-automake.patch deleted file mode 100644 index 7b5f77ca1..000000000 --- a/libre/gnu-ghostscript/ijs-automake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gnu-ghostscript-9.06.0.orig/ijs/configure.ac 2012-12-26 23:11:50.000000000 -0200 -+++ gnu-ghostscript-9.06.0/ijs/configure.ac 2013-02-04 13:28:10.656069912 -0200 -@@ -117,7 +117,6 @@ - dnl Checks for programs - - AC_PROG_CC --AM_PROG_CC_STDC - AM_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - AC_ISC_POSIX diff --git a/libre/gnu-ghostscript/libtool.patch b/libre/gnu-ghostscript/libtool.patch deleted file mode 100644 index 4271ce69b..000000000 --- a/libre/gnu-ghostscript/libtool.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnu-ghostscript-9.04.1/ltmain.sh 2011-12-31 08:26:26.000000000 -0200 -+++ gnu-ghostscript-9.04.1/ltmain.sh 2012-04-10 05:08:19.253341477 -0300 -@@ -79,9 +79,9 @@ - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.4 -+VERSION=2.4.2 - TIMESTAMP="" --package_revision=1.3293 -+package_revision=1.3337 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- cgit v1.2.3 From b4be00b7e935128449201c131f1aaa728cfecca1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 00:10:19 -0200 Subject: gummiboot-43-2: updating version --- libre/gummiboot/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index bd697b3f6..85804c9c0 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202399 2013-12-21 16:55:19Z tomegun $ +# $Id: PKGBUILD 204682 2014-01-24 22:03:35Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -6,9 +6,9 @@ # Maintainer (Parabola): André Silva pkgname="gummiboot" -pkgver="41" -pkgrel="1" -pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" +pkgver="43" +pkgrel="2" +pkgdesc="Simple UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" arch=('x86_64' 'i686' 'mips64el') license=('LGPL2.1') @@ -18,7 +18,7 @@ conflicts=('gummiboot-efi') provides=('gummiboot-efi') replaces=('gummiboot-efi') options=('!strip' '!makeflags') -source=("git://anongit.freedesktop.org/${pkgname}#commit=ba731cee" +source=("git://anongit.freedesktop.org/${pkgname}#commit=48e0a487" 'loader.conf' 'parabola.conf' 'splash-parabola.bmp') -- cgit v1.2.3 From c7555a26857f08cecb2fb7c2a695c7aaf964dbbb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 14:11:57 -0200 Subject: remove iceape-libre and iceape-l10n because the sources aren't maintained anymore --- libre/iceape-l10n/PKGBUILD | 101 ----------- libre/iceape-l10n/region.properties | 32 ---- libre/iceape-libre/PKGBUILD | 147 ---------------- libre/iceape-libre/clrf.patch | 260 ---------------------------- libre/iceape-libre/gcc47.patch | 63 ------- libre/iceape-libre/iceape-2.0-lang.patch | 11 -- libre/iceape-libre/iceape.desktop | 11 -- libre/iceape-libre/iceape.install | 12 -- libre/iceape-libre/libre.patch | 285 ------------------------------- libre/iceape-libre/mozconfig | 38 ----- 10 files changed, 960 deletions(-) delete mode 100644 libre/iceape-l10n/PKGBUILD delete mode 100644 libre/iceape-l10n/region.properties delete mode 100644 libre/iceape-libre/PKGBUILD delete mode 100644 libre/iceape-libre/clrf.patch delete mode 100644 libre/iceape-libre/gcc47.patch delete mode 100644 libre/iceape-libre/iceape-2.0-lang.patch delete mode 100644 libre/iceape-libre/iceape.desktop delete mode 100644 libre/iceape-libre/iceape.install delete mode 100644 libre/iceape-libre/libre.patch delete mode 100644 libre/iceape-libre/mozconfig (limited to 'libre') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD deleted file mode 100644 index 00341af26..000000000 --- a/libre/iceape-l10n/PKGBUILD +++ /dev/null @@ -1,101 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: fauno -# Contributor: Figue -# Maintainer: Márcio Silva -# Maintainer: André Silva -# Based on icecat-i18n package, which is in turn based on firefox-i18n - -# When updating to a newer upstream release: -# - Edit variables in in Makefile. -# - (optionally) edit PKGBUILD.in -# - Run 'make'. It will take care of everything else for you. - -_debname=iceape -_debver=2.7.12 -_debrel=deb1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN) - -pkgbase=iceape-l10n -pkgname=($(for lang in ${_langpacks[@]} - do echo $pkgbase-$lang | tr A-Z a-z - done)) -epoch=1 -pkgver=${_debver}.${_debrel} -pkgrel=1 - -pkgdesc="Language packs for Debian Iceape." -arch=('any') -url="http://packages.debian.org/sid/iceape" -license=('MPL' 'GPL') -depends=("iceape-libre>=$epoch:$pkgver") -makedepends=('unzip' 'zip') -source=('region.properties') -for lang in ${_langpacks[@]} -do - source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb") -done - -_path="/usr/lib/iceape/extensions" - -build() { - cd "${srcdir}" - for f in *.deb - do - bsdtar xf $f - bsdtar xf data.tar.gz - done - - cd $srcdir/$_path - - for i in ${_langpacks[@]} - do - cd $srcdir/$_path - unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i - rm langpack-$i@iceape.mozilla.org.xpi - install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region - cd $i - zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi . - done - - cd $srcdir -} - -for lang in ${_langpacks[@]} -do - eval " -package_iceape-l10n-$(echo $lang | tr A-Z a-z)() { - replaces=(iceape-i18n-$(echo $lang | tr A-Z a-z)) - conflicts=(iceape-i18n-$(echo $lang | tr A-Z a-z)) - provides=(iceape-i18n-$(echo $lang | tr A-Z a-z)) - install -Dm644 \"\$srcdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceape.mozilla.org.xpi\" -} -" -done - -md5sums=('7558c5a34cc5f661d4e96885300d0c41' - '22a14a6a2f03d0004a1fa990892094ef' - 'af2379ea50672fe37ff8550d5c9e20a0' - 'e5975c3b1ffaa5fcb3f5203cdfe8e0fb' - '21fcbd011acc382f5ec7a32aa04562ef' - '8fbf821c811c55514a100ae5d5e9e844' - 'bd8f18e0d0f233e0a1c1a518537798a5' - '037cbb6fe0576f7f5bbbf956928f01e1' - '56964b577fcb077a9b81d07c59cc5af3' - 'd2fb622717114a921efb37f028f31c6c' - '6abe2dbab7fcbdaf43e77290ca6853c9' - '558a2d29be749f6506f774703c58952f' - '7abdc6eb4154b88509a6c4f119c943a7' - '5a4fad9c23c8d19833ac5c76ad9aca4a' - '8d45110acc90f388923f01fb9cfca947' - 'd1acbe2ef1120e70d5365476aa8679f9' - '604de00ea6ee06565212804b0d499df3' - 'ceee78a29bd2f947558f04489ee50f54' - 'afc6e343f0635a3ee5b7a22af947e8b8' - '455bab7a596cb43ac4ad80cb89a78b25' - '92a985b40aec8b3726ba22f45667994d' - 'bc8c98f0518617ed2220fb3bfb03e165' - '449c91720751538f09ad3d555dbe2fce' - '8843be8937963d094d4272ac33019082') diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties deleted file mode 100644 index 551605dd7..000000000 --- a/libre/iceape-l10n/region.properties +++ /dev/null @@ -1,32 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# Default search engine -browser.search.defaultenginename=DuckDuckGo HTML - -# Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=DuckDuckGo HTML -browser.search.order.2=DuckDuckGo Lite -browser.search.order.3=Seeks Search - -# 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=https://duckduckgo.com/html/?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 irc: -gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net - -# The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD deleted file mode 100644 index 601de26b9..000000000 --- a/libre/iceape-libre/PKGBUILD +++ /dev/null @@ -1,147 +0,0 @@ -# Maintainer : Márcio Silva -# Maintainer : André Silva - -# We're getting this from Debian Sid -_debname=iceape -_debver=2.7.12 -_debrel=deb1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_pkgname=${_debname} -pkgname=${_debname}-libre -epoch=1 -pkgver=${_debver}.${_debrel} -pkgrel=1 -pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." -arch=('i686' 'x86_64' 'mips64el') -license=('MPL' 'GPL' 'LGPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') -replaces=('seamonkey') -conflicts=('seamonkey') -provides=('seamonkey') -install=$_pkgname.install -url="http://packages.debian.org/sid/${_pkgname}" -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" - mozconfig - ${_pkgname}.desktop - ${_pkgname}-2.0-lang.patch - clrf.patch - libre.patch) -md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' - '1fb9c4affad5f030c4e3544aadeaeea2' - '70575e76b339fa7e17274a8ed84429fc' - '7266333e31731af8bb50c2eca8d0bd26' - '25b6fe16ac24cd5c852213e5c1adb272' - 'c395d443a8c4c16880c7322bcf174743' - '14e2f08fb1b98ff287e74de54baf44fe') - -prepare() { - export DEBIAN_BUILD="comm-release" - export DEBIAN_BRANDING_DIR="debian/branding" - - export ICEAPE_ICONS_BRANDING="suite/branding/nightly" - - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - - mv comm-esr10 "${DEBIAN_BUILD}" - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" - quilt push -av - - patch -Np1 -i "$srcdir/$_pkgname-2.0-lang.patch" - patch -Np1 -i "$srcdir/clrf.patch" - patch -Np1 -i "$srcdir/libre.patch" - - # set up a simple non-animated throbber from the icon - install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber-anim.png - install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber-single.png - install -m644 debian/extras/Throbber-small.gif suite/themes/classic/communicator/brand/throbber16-anim.png - install -m644 debian/extras/Throbber-small.png suite/themes/classic/communicator/brand/throbber16-single.png - install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber-anim.png - install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber-single.png - install -m644 debian/extras/Throbber-small.gif suite/themes/modern/communicator/brand/throbber16-anim.png - install -m644 debian/extras/Throbber-small.png suite/themes/modern/communicator/brand/throbber16-single.png - - install -m644 debian/extras/preview.png suite/themes/classic/preview.png - - # Converting svg file to png and replacing seamonkey by iceape icons - rsvg-convert -w 300 -h 280 -o ${ICEAPE_ICONS_BRANDING}/content/about.png ${DEBIAN_BRANDING_DIR}/iceape_logo_plain.svg - rsvg-convert -w 64 -h 64 -o ${ICEAPE_ICONS_BRANDING}/content/icon64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 128 -h 128 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - - # Creating app-icons Folder for iceape*.png icons - - install -m755 -d "${DEBIAN_BRANDING_DIR}/app-icons" - - # Icons for /usr/share/icons/hicolor - rsvg-convert -w 16 -h 16 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 32 -h 32 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape32.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 48 -h 48 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 64 -h 64 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg - - cp "${srcdir}/mozconfig" .mozconfig - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure -} - -build() { - export DEBIAN_BUILD="comm-release" - export DEBIAN_BRANDING_DIR="debian/branding" - - export ICEAPE_ICONS_BRANDING="suite/branding/nightly" - - cd "${srcdir}/${DEBIAN_BUILD}" - - export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - # Don't exit with error when some libs are missing which we have in - # system. - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ - -i suite/installer/Makefile.in - - make -j1 -f client.mk build -} - -package() { - export DEBIAN_BUILD="comm-release" - export DEBIAN_BRANDING_DIR="debian/branding" - - export ICEAPE_ICONS_BRANDING="suite/branding/nightly" - - cd "${srcdir}/${DEBIAN_BUILD}" - - make -j1 -f client.mk DESTDIR="${pkgdir}" install - - rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation,searchplugins} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" - - install -m755 -d "$pkgdir/usr/share/applications" - install -m755 -d "$pkgdir/usr/share/pixmaps" - install -m644 ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png \ - "$pkgdir/usr/share/pixmaps/" - - for i in 16x16 32x32 48x48 64x64 128x128; do - install -Dm644 "${DEBIAN_BRANDING_DIR}/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" - done - install -Dm644 "${DEBIAN_BRANDING_DIR}/${_pkgname}_icon_plain.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg" - - install -m644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/" -} diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch deleted file mode 100644 index 375708ac4..000000000 --- a/libre/iceape-libre/clrf.patch +++ /dev/null @@ -1,260 +0,0 @@ -diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp ---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-12 23:37:12.000000000 -0300 -+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-05-07 12:33:58.517612453 -0300 -@@ -688,7 +688,7 @@ - PL_strcat(encoding, "{"); - lengthStr.AppendInt((PRInt32) strlen(value)); - PL_strcat(encoding, lengthStr.get()); -- PL_strcat(encoding, "}"CRLF); -+ PL_strcat(encoding, "}" CRLF); - PL_strcat(encoding, value); - return NS_OK; - } -diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp ---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-05-07 12:41:08.003264793 -0300 -@@ -753,7 +753,7 @@ - } - } - } --#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK -+#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK - - // if status offset isn't in the first block, this code won't work. There's no good reason - // for the status offset not to be at the beginning of the message anyway. -@@ -1203,7 +1203,7 @@ - // check if there's an envelope header; if not, write one. - if (strncmp(m_dataBuffer, "From ", 5)) - { -- m_fileStream->Write("From "CRLF, 7, &bytesWritten); -+ m_fileStream->Write("From " CRLF, 7, &bytesWritten); - m_offlineMsgSize += bytesWritten; - } - } -diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp ---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-05-07 12:44:43.127347489 -0300 -@@ -1722,7 +1722,7 @@ - { - m_sendDone = PR_TRUE; - nsCOMPtr url = do_QueryInterface(m_runningURL); -- SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server. -+ SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server. - m_nextState = SMTP_RESPONSE; - m_nextStateAfterResponse = SMTP_DONE; - return(0); -@@ -1969,7 +1969,7 @@ - { - nsCOMPtr url = do_QueryInterface(m_runningURL); - // send a quit command to close the connection with the server. -- if (SendData(url, "QUIT"CRLF) == NS_OK) -+ if (SendData(url, "QUIT" CRLF) == NS_OK) - { - m_nextState = SMTP_RESPONSE; - m_nextStateAfterResponse = SMTP_ERROR_DONE; -diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp ---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-05-07 12:48:29.417179064 -0300 -@@ -8298,7 +8298,7 @@ - bool needMoreData = false; - char * newLine = nsnull; - PRUint32 numBytesInLine = 0; -- const char *envelope = "From "CRLF; -+ const char *envelope = "From " CRLF; - offlineStore->Write(envelope, strlen(envelope), &bytesWritten); - fileSize += bytesWritten; - do -diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp ---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-05-07 15:45:58.551202719 -0300 -@@ -1410,7 +1410,7 @@ - { - // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages(); - nsCAutoString commandBuffer(GetServerCommandTag()); -- commandBuffer.Append(" IDLE"CRLF); -+ commandBuffer.Append(" IDLE" CRLF); - - do - { -@@ -3290,7 +3290,7 @@ - commandString.Append(messageIds); - commandString.Append(" ("); - commandString.Append(attribute); -- commandString.Append(")"CRLF); -+ commandString.Append(")" CRLF); - nsresult rv = SendData(commandString.get()); - - if (NS_SUCCEEDED(rv)) -@@ -5283,7 +5283,7 @@ - - IncrementCommandTagNumber(); - nsCAutoString command(GetServerCommandTag()); -- command.Append(" expunge"CRLF); -+ command.Append(" expunge" CRLF); - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -5359,7 +5359,7 @@ - command.Append(gAppName); - command.Append("\" \"version\" \""); - command.Append(gAppVersion); -- command.Append("\")"CRLF); -+ command.Append("\")" CRLF); - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -5816,7 +5816,7 @@ - nsCAutoString correctedPassword; - EscapeUserNamePasswordString(password.get(), &correctedPassword); - command.Append(correctedPassword); -- command.Append("\""CRLF); -+ command.Append("\"" CRLF); - rv = SendData(command.get(), PR_TRUE /* suppress logging */); - NS_ENSURE_SUCCESS(rv, rv); - ParseIMAPandCheckForNewMail(); -@@ -7446,7 +7446,7 @@ - nsCString command(GetServerCommandTag()); - command += " create \""; - command += escapedName; -- command += "\""CRLF; -+ command += "\"" CRLF; - - nsresult rv = SendData(command.get()); - if(NS_SUCCEEDED(rv)) -@@ -7549,7 +7549,7 @@ - nsCString command (GetServerCommandTag()); - command += " lsub \"\" \""; - command += escapedPattern; -- command += "\""CRLF; -+ command += "\"" CRLF; - - PR_Free(boxnameWithOnlineDirectory); - -@@ -7578,7 +7578,7 @@ - command += useXLIST ? - " xlist \"\" \"" : " list \"\" \""; - command += escapedPattern; -- command += "\""CRLF; -+ command += "\"" CRLF; - - PR_Free(boxnameWithOnlineDirectory); - -@@ -7599,7 +7599,7 @@ - nsCString command (GetServerCommandTag()); - command += " subscribe \""; - command += escapedName; -- command += "\""CRLF; -+ command += "\"" CRLF; - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -7617,7 +7617,7 @@ - nsCString command (GetServerCommandTag()); - command += " unsubscribe \""; - command += escapedName; -- command += "\""CRLF; -+ command += "\"" CRLF; - - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) -@@ -7631,7 +7631,7 @@ - if (m_urlInProgress) - return; - nsCAutoString command (GetServerCommandTag()); -- command += " IDLE"CRLF; -+ command += " IDLE" CRLF; - nsresult rv = SendData(command.get()); - if (NS_SUCCEEDED(rv)) - { -@@ -7658,7 +7658,7 @@ - nsCOMPtr asyncInputStream = do_QueryInterface(m_inputStream); - if (asyncInputStream) - asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull); -- nsresult rv = SendData("DONE"CRLF); -+ nsresult rv = SendData("DONE" CRLF); - // set a short timeout if we don't want to wait for a response - if (m_transport && !waitForResponse) - m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5); -@@ -7727,8 +7727,8 @@ - PRUint32 msgsHandled = 0; - const char *formatString; - formatString = (idsAreUid) -- ? "%s uid store %s %s"CRLF -- : "%s store %s %s"CRLF; -+ ? "%s uid store %s %s" CRLF -+ : "%s store %s %s" CRLF; - - do - { -diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp ---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-05-07 12:57:22.050615120 -0300 -@@ -185,7 +185,7 @@ - - NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && - *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string"); -- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF); -+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF); - if (sendingIdleDone) - fWaitingForMoreClientInput = PR_FALSE; - -diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp ---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-05-07 12:59:45.857182813 -0300 -@@ -2483,7 +2483,7 @@ - return(MK_OUT_OF_MEMORY); - m_pop3ConData->next_state_after_response = POP3_GET_LIST; - m_listpos = 0; -- return SendData(m_url, "LIST"CRLF); -+ return SendData(m_url, "LIST" CRLF); - } - - -diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp ---- comm-release.orig/mailnews/mime/src/mimedrft.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-05-07 13:01:42.912022177 -0300 -@@ -1473,7 +1473,7 @@ - *newbody = 0; - PL_strcatn(newbody, newbodylen, "
");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "
"CRLF); -+ PL_strcatn(newbody, newbodylen, "" CRLF); - PR_Free(body); - body = newbody; - } -diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp ---- comm-release.orig/mailnews/mime/src/mimemult.cpp 2012-03-12 23:37:13.000000000 -0300 -+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-05-07 13:04:41.511265477 -0300 -@@ -280,7 +280,7 @@ - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\"")); - MimeWriteAString(obj, fileName); -- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: ")); - MimeWriteAString(obj, obj->options->state->detachedFilePath); - MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK)); -@@ -293,10 +293,10 @@ - status = MimeWriteAString(obj, header); - if (status < 0) - return status; -- status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK)); -+ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK)); - MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: ")); - MimeWriteAString(obj, fileName); -- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\"")); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\"")); - } - nsCString result; - char timeBuffer[128]; -@@ -306,8 +306,8 @@ - "%a %b %d %H:%M:%S %Y", - &now); - MimeWriteAString(obj, nsDependentCString(timeBuffer)); -- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK)); -- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK)); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK)); -+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK)); - MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE); - } - PRInt32 old_nchildren = container->nchildren; diff --git a/libre/iceape-libre/gcc47.patch b/libre/iceape-libre/gcc47.patch deleted file mode 100644 index 115d65131..000000000 --- a/libre/iceape-libre/gcc47.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000 -@@ -8,7 +8,7 @@ - #include - #endif - #include --#if defined(ANDROID) -+#if defined(ANDROID) || defined(OS_POSIX) - #include - #endif - -diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:38:11.381450924 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:43:29.218995578 +0000 -@@ -5,6 +5,9 @@ - #include "base/file_util.h" - - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - #include -diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:38:11.438117153 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:43:29.218995578 +0000 -@@ -6,6 +6,9 @@ - - #include - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include "eintr_wrapper.h" - #include "base/logging.h" -diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc ---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:38:11.418117308 +0000 -+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:43:29.218995578 +0000 -@@ -14,6 +14,8 @@ - #include - #endif - -+#include -+ - #include - - #include "base/basictypes.h" -diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in ---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000 -+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000 -@@ -69,6 +69,9 @@ - $(STDCXX_COMPAT) \ - $(NULL) - -+# Needed for moz_free -+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc -+ - ifeq ($(OS_ARCH),WINNT) - CPPSRCS += crashreporter_win.cpp - LIBS += \ diff --git a/libre/iceape-libre/iceape-2.0-lang.patch b/libre/iceape-libre/iceape-2.0-lang.patch deleted file mode 100644 index b9f4a5cde..000000000 --- a/libre/iceape-libre/iceape-2.0-lang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 -+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 -@@ -890,7 +890,7 @@ - pref("intl.charset.detector", "chrome://global/locale/intl.properties"); - pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); - pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); --pref("intl.locale.matchOS", false); -+pref("intl.locale.matchOS", true); - // fallback charset list for Unicode conversion (converting from Unicode) - // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) - // for ISO-8859-1 diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop deleted file mode 100644 index 0868e5058..000000000 --- a/libre/iceape-libre/iceape.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=iceape %u -Icon=iceape -Type=Application -Terminal=false -MultipleArgs=false -Name=Iceape Internet Suite -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto; -StartupNotify=false -Categories=Application;Network; diff --git a/libre/iceape-libre/iceape.install b/libre/iceape-libre/iceape.install deleted file mode 100644 index 709ad81f2..000000000 --- a/libre/iceape-libre/iceape.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch deleted file mode 100644 index 6473412e4..000000000 --- a/libre/iceape-libre/libre.patch +++ /dev/null @@ -1,285 +0,0 @@ ---- 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-11-29 22:19:37.998383034 -0200 -@@ -1,23 +1,16 @@ - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # 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 -- --# 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=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - - # 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/html/?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 -@@ -26,20 +19,10 @@ - # 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 -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+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.schemes.ircs.0.name=Freenode Web IRC -+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 @@ - // SYNTAX HINTS: dashes are delimiters. Use underscores instead. - // 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", "https://duckduckgo.com/html/?q="); - pref("keyword.enabled", false); - pref("general.useragent.locale", "chrome://global/locale/intl.properties"); - pref("general.useragent.compatMode.firefox", false); ---- comm-release.orig/mozilla/toolkit/content/plugins.html 2012-02-16 12:09:35.000000000 -0200 -+++ comm-release/mozilla/toolkit/content/plugins.html 2012-05-12 03:56:16.599192244 -0300 -@@ -98,18 +98,6 @@ - else - document.writeln("

" + pluginsbundle.GetStringFromName("nopluginsareenabled_label") + "<\/h1>"); - -- document.writeln("
" + pluginsbundle.GetStringFromName("findmore_label") + " "); -- document.writeln("" + regionbundle.GetStringFromName("more_plugins_label") + "<\/a>."); -- document.writeln("<\/div>"); -- -- document.writeln("
" + pluginsbundle.GetStringFromName("findpluginupdates_label") + " "); -- document.writeln("" + regionbundle.GetStringFromName("pluginupdates_label") + "<\/a>."); -- document.writeln("<\/div>"); -- -- document.writeln("
" + pluginsbundle.GetStringFromName("installhelp_label") + " "); -- document.writeln("" + regionbundle.GetStringFromName("plugindoc_label") + "<\/a>."); -- document.writeln("<\/div>
"); -- - for (var i = 0; i < numPlugins; i++) - { - var plugin = navigator.plugins[i]; ---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js 2012-02-16 12:09:38.000000000 -0200 -+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.js 2012-05-12 03:59:11.639451163 -0300 -@@ -107,6 +107,7 @@ - this.mPluginInfoArrayLength++; - } else { - this.mPluginNotFoundArray[aPluginRequestItem.mimetype] = aPluginRequestItem; -+ this.mPluginNotFoundArray[aPluginRequestItem.mimetype].pluginsPage = null; - this.mPluginNotFoundArrayLength++; - } - ---- comm-release.orig/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul 2012-02-16 12:09:38.000000000 -0200 -+++ comm-release/mozilla/toolkit/mozapps/plugins/content/pluginInstallerWizard.xul 2012-05-12 04:01:29.208462907 -0300 -@@ -138,10 +138,6 @@ - - -- -- - - - ---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 21:25:41.879931999 -0200 -+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 22:25:15.125790092 -0200 -@@ -4,18 +4,11 @@ - # - browser.startup.homepage=about: - browser.throbber.url=about: --browser.search.defaulturl=http://www.google.com/search?q= -+browser.search.defaulturl=https://duckduckgo.com/html/?q= - --browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u= --browser.translation.serviceDomain=translate.google.com -+browser.translation.service=about: -+browser.translation.serviceDomain= - - #config.js - # - startup.homepage_override_url=about: -- --# 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 ---- 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-11-29 22:26:25.271781371 -0200 -@@ -1,10 +1,10 @@ - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # 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 HTML -+browser.search.order.2=DuckDuckGo Lite - - # 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: ---- 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 @@ - # messenger.properties - # mailnews.js - mailnews.start_page.url=chrome://messenger/content/start.xhtml --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: -+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: ---- comm-release.orig/suite/locales/en-US/profile/bookmarks.extra 2012-02-16 11:59:54.000000000 -0200 -+++ comm-release/suite/locales/en-US/profile/bookmarks.extra 2012-05-12 04:34:50.172992393 -0300 -@@ -9,9 +9,7 @@ - -

Search the Web

-

--

Google --
Google Groups --
Google News -+
Duck Duck Go (HTML) -

- - #unfilter emptyLines ---- comm-release.orig/suite/browser/browser-prefs.js 2012-10-17 11:29:38.687716662 -0200 -+++ comm-release/suite/browser/browser-prefs.js 2012-10-17 11:39:01.778002338 -0200 -@@ -110,7 +110,7 @@ - pref("browser.doorhanger.enabled", true); - - // search engines URL --pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/"); -+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); - - // pointer to the default engine name - pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); -@@ -587,10 +587,10 @@ - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/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"); - - // getMoreThemes is used by our UI under our switch theme menu - pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); -@@ -715,7 +715,7 @@ - #endif - - // plugin finder service url --pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%"); -+pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/"); - pref("plugins.update.notifyUser", false); - pref("plugins.hide_infobar_for_outdated_plugin", false); ---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.dtd 2012-05-12 05:14:55.000000000 -0300 -+++ comm-release/suite/locales/en-US/chrome/branding/brand.dtd 2012-05-12 05:32:18.992033502 -0300 -@@ -1,4 +1,4 @@ - - -- -+ - ---- comm-release.orig/suite/locales/en-US/chrome/branding/brand.properties 2012-05-12 05:14:55.000000000 -0300 -+++ comm-release/suite/locales/en-US/chrome/branding/brand.properties 2012-05-12 05:36:38.640803397 -0300 -@@ -1,9 +1,9 @@ - brandFullName=Iceape - brandShortName=Iceape --vendorShortName=Debian -+vendorShortName=Parabola - sidebarName=Sidebar --extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes -+extensions.getMoreThemesURL=http://www.gnu.org/software/gnuzilla/addons.html#themes - extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas - 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: -+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 @@ -

-

@personal_toolbarfolder@

-

--

@seamonkey@ -- @seamonkey_l10n@ --
@mozilla_org@ --
@mozillazine@ --
@mozdev@ -+
Parabola GNU/Linux-libre -+
Free Software Foundation -+
LibrePlanet -

--

@seamonkey_and_mozilla@

-+

GNUzilla

-

--

@seamonkey_long@ -- @seamonkey_l10n_long@ --

@mozilla_org@

--

--

@mozilla_org_long@ --
@mozilla_projects@ --
@mozilla_about@ --

--

@extend_seamonkey@

--

--

@seamonkey_addons@ --
@seamonkey_themes@ --
@seamonkey_dictionaries@ --
@seamonkey_plugins@ --
@mozdev@ --
@mozdev_seamonkey@ --

--

@community_support@

--

--

@seamonkey_community@ --
@mozillazine@ --
@seamonkey_support@ --

-+

GNUzilla and IceCat -+
Free addons -

- #include bookmarks.extra -

diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig deleted file mode 100644 index 3093d20ee..000000000 --- a/libre/iceape-libre/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -ac_add_options --enable-application=suite - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# Iceape -ac_add_options --disable-official-branding -ac_add_options --with-branding=debian/branding - -# 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 --with-pthreads - -# Features -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-installer - -export MOZILLA_OFFICIAL=1 - -# Parabola features -ac_add_options --disable-safe-browsing -- cgit v1.2.3 From 7395b28b4a9ebcc527f0e1b6ab37335ebdde109f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 14:13:04 -0200 Subject: remove dkms-libre because is only useful with nonfree open-vm-tools-dkms, virtualbox-guest-dkms and virtualbox-host-dkms --- libre/dkms-libre/01-broken-uninstall.patch | 22 ---------- libre/dkms-libre/02-no-kernel-hook.patch | 13 ------ libre/dkms-libre/PKGBUILD | 66 ------------------------------ libre/dkms-libre/dkms.default | 9 ---- libre/dkms-libre/dkms.hook | 12 ------ libre/dkms-libre/dkms.install | 13 ------ libre/dkms-libre/dkms.service | 11 ----- libre/dkms-libre/dkms.systemd | 61 --------------------------- 8 files changed, 207 deletions(-) delete mode 100644 libre/dkms-libre/01-broken-uninstall.patch delete mode 100644 libre/dkms-libre/02-no-kernel-hook.patch delete mode 100644 libre/dkms-libre/PKGBUILD delete mode 100644 libre/dkms-libre/dkms.default delete mode 100644 libre/dkms-libre/dkms.hook delete mode 100644 libre/dkms-libre/dkms.install delete mode 100644 libre/dkms-libre/dkms.service delete mode 100644 libre/dkms-libre/dkms.systemd (limited to 'libre') diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch deleted file mode 100644 index a859efabe..000000000 --- a/libre/dkms-libre/01-broken-uninstall.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dkms b/dkms -index abb01a4..265b69a 100644 ---- a/dkms -+++ b/dkms -@@ -162,11 +162,14 @@ set_kernel_source_dir() - - # A little test function for DKMS commands that only work on one kernel. - have_one_kernel() { -- (( ${#kernelver[@]} > 1 )) && \ -- die 4 $"The action $1 does not support multiple kernel version" \ -- $"parameters on the command line." -- [[ $all ]] && die 5 $"The action $1 does not support the --all" \ -- $"parameter." -+ if (( ${#kernelver[@]} != 1 )); then -+ die 4 $"The action $1 does not support multiple kernel version" \ -+ $"parameters on the command line." -+ fi -+ if [[ $all ]]; then -+ die 5 $"The action $1 does not support the --all" \ -+ $"parameter." -+ fi - } diff --git a/libre/dkms-libre/02-no-kernel-hook.patch b/libre/dkms-libre/02-no-kernel-hook.patch deleted file mode 100644 index f01f22002..000000000 --- a/libre/dkms-libre/02-no-kernel-hook.patch +++ /dev/null @@ -1,13 +0,0 @@ -# Author: Sébastien Luttringer ---- a/Makefile 2011-12-07 19:23:51.000000000 +0100 -+++ b/Makefile 2013-05-13 00:48:19.620000000 +0200 -@@ -46,9 +46,6 @@ - gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz - chmod 0644 $(MAN)/dkms.8.gz - touch --reference=dkms.8 $(MAN)/dkms.8.gz -- mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d -- install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms -- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms - - DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec - diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD deleted file mode 100644 index 0f3f66c38..000000000 --- a/libre/dkms-libre/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $ -# Maintainer: Sébastien Luttringer -# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com) -# Maintainer (Parabola): André Silva - -_pkgname=dkms -pkgname=dkms-libre -pkgver=2.2.0.3 -pkgrel=14 -pkgdesc='Dynamic Kernel Modules System, with linux-libre-headers and linux-libre-lts-headers recommendation' -arch=('any') -url='http://linux.dell.com/dkms/' -license=('GPL2') -depends=('bash' 'kmod' 'gcc' 'make' 'patch') -optdepends=('linux-libre-headers: build modules against linux-libre kernel' - 'linux-libre-lts-headers: build modules against linux-libre-lts kernel') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -backup=('etc/dkms/framework.conf' 'etc/default/dkms') -install=$_pkgname.install -source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz" - "$_pkgname.default" - "$_pkgname.service" - "$_pkgname.systemd" - '01-broken-uninstall.patch' - '02-no-kernel-hook.patch') -md5sums=('11a8aaade2ebec2803653837c7593030' - '33be2fbf1bcc1b3fb2f38d9e7eaa809d' - '02e9744e3fdc3d2f68e46966fb32e260' - '267632312aa52a190ec0db0758920dd3' - '2dfd8656dc79afd229c1481a90fb645b' - '82d520c39c99c34977e48b313a189c6c') - -prepare() { - # patch - patches=("$srcdir"/*.patch) - cd $_pkgname-$pkgver - for p in "${patches[@]}"; do - msg2 "Apply patch: ${p##*/}" - patch -p1 -i "$p" - done - # /usr move - msg2 '/usr move patching' - for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do - sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i" - done - # fix hardcoded paths - sed -i "s|/sbin/depmod|depmod|" dkms -} - -package() { - # systemd - install -D -m 644 $_pkgname.service "$pkgdir/usr/lib/systemd/system/$_pkgname.service" - install -D -m 755 $_pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$_pkgname" - install -D -m 644 $_pkgname.default "$pkgdir/etc/default/$_pkgname" - # upstream installer - cd $_pkgname-$pkgver - make \ - DESTDIR="$pkgdir" \ - SBIN="$pkgdir/usr/bin" \ - BASHDIR="$pkgdir/usr/share/bash-completion/completions" \ - install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/dkms-libre/dkms.default b/libre/dkms-libre/dkms.default deleted file mode 100644 index d430855bb..000000000 --- a/libre/dkms-libre/dkms.default +++ /dev/null @@ -1,9 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -# With LOAD set to yes, modules listed as installed will be loaded with -# systemctl start dkms.service. Default is yes. -LOAD=yes - -# With UNLOAD set to yes, modules listed as installed will be unloaded with -# systemctl stop dkms.service. Default is no. -UNLOAD=no diff --git a/libre/dkms-libre/dkms.hook b/libre/dkms-libre/dkms.hook deleted file mode 100644 index 3d656e32d..000000000 --- a/libre/dkms-libre/dkms.hook +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -dkms_autoinstall() { - export TMPDIR=/dev/shm - status 'Starting DKMS autoinstall' dkms autoinstall - unset TMPDIR -} - -add_hook single_udevlaunched dkms_autoinstall -add_hook sysinit_udevlaunched dkms_autoinstall - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.install b/libre/dkms-libre/dkms.install deleted file mode 100644 index 4dd18dd19..000000000 --- a/libre/dkms-libre/dkms.install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then - cat << EOF -===> dkms startup config file moved to /etc/default/dkms -EOF - fi -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.service b/libre/dkms-libre/dkms.service deleted file mode 100644 index 0e679a949..000000000 --- a/libre/dkms-libre/dkms.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Dynamic Kernel Modules System - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/lib/systemd/scripts/dkms start -ExecStop=/usr/lib/systemd/scripts/dkms stop - -[Install] -WantedBy=multi-user.target diff --git a/libre/dkms-libre/dkms.systemd b/libre/dkms-libre/dkms.systemd deleted file mode 100644 index 03e6bfe97..000000000 --- a/libre/dkms-libre/dkms.systemd +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -. /etc/default/dkms - -# list dkms modules for the current running kernel -list_dkms_modules() { - shopt -s nullglob - declare -a DKMS_MOULES - # dkms status needs uname -r to list correctly intalled version for current kernel - local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p')) - for p in "${modules_path[@]}"; do - for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do - m=${m##*/} - m=${m%.gz} - m=${m%.ko} - DKMS_MODULES+=("$m") - done - done -} - -# load installed kernel modules for the current kernel version -load_dkms_modules() { - local ret=0 - list_dkms_modules - for m in "${DKMS_MODULES[@]}"; do - modprobe "$m" - ret+=$? - done - return $ret -} - -# unload installed kernel modules for the current kernel version -unload_dkms_modules() { - list_dkms_modules - # ask for removal - for m in "${DKMS_MODULES[@]}"; do - modprobe --remove --quiet "$m" - done - # check modules are unloaded - # sometimes modprobe -r fail but modules are removed - for m in "${DKMS_MODULES[@]}"; do - [[ -e /sys/modules/$m ]] && return 1 - done - return 0 -} - -case "$1" in - start) - dkms autoinstall -k "$(uname -r)" - [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules - ;; - stop) - [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules - ;; - *) - echo "usage: $0 {start|stop}" >&2 - ;; -esac - -: -# vim:set ts=2 sw=2 ft=sh et: -- cgit v1.2.3 From b0580523f40b4096959dd1e573ec46b881e37db2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 14:20:43 -0200 Subject: remove "-libre" suffix on makedepends, depends and optdepends to avoid break dependencies on the future --- libre/audacious-plugins-libre/PKGBUILD | 6 +++--- libre/clementine-libre/PKGBUILD | 4 ++-- libre/dvdrip-libre/PKGBUILD | 6 +++--- libre/icecat/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 4 ++-- libre/liferea-libre/PKGBUILD | 4 ++-- libre/texlive-core-libre/PKGBUILD | 4 ++-- libre/wings3d-libre/PKGBUILD | 4 ++-- libre/xbmc-libre/PKGBUILD | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'libre') diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 57c1440f5..8c631469b 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4.3 -pkgrel=2 +pkgrel=2.1 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') @@ -32,7 +32,7 @@ makedepends=("audacious>=${pkgver}" 'glib2' 'python2' # for gdbus-codegen 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack' - 'libnotify' 'lirc-utils-libre' 'curl' 'libmtp' + 'libnotify' 'lirc-utils' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') optdepends=('alsa-lib: Advanced Linux Sound Arch. output' @@ -52,7 +52,7 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output' 'wavpack: WavPack input' 'libnotify: libnotify OSD' - 'lirc-utils-libre: LIRC' + 'lirc-utils: LIRC' 'curl: AudioScrobbler Client' 'libmtp: Upload to MTP device' diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 5bebf2bb6..e74b26c45 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -10,7 +10,7 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.2.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') @@ -19,7 +19,7 @@ depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastf makedepends=('cmake' 'boost' 'mesa' 'sparsehash') optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' 'gstreamer0.10-good-plugins: "Good" plugin libraries' - 'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries' + 'gstreamer0.10-bad-plugins: "Bad" plugin libraries' 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' 'gvfs: Various devices support') replaces=('clementine') diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD index 2069f1c8a..4461dfae7 100644 --- a/libre/dvdrip-libre/PKGBUILD +++ b/libre/dvdrip-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=dvdrip pkgname=dvdrip-libre pkgver=0.98.11 -pkgrel=10.1 +pkgrel=10.2 pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies" arch=('i686' 'x86_64') license=('custom') @@ -16,8 +16,8 @@ depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') optdepends=('xvid4conf: xvid4 configuration tool' 'lsdvd: Needed for faster DVD TOC reading' - 'mplayer-libre: Needed for subtitle vobsub viewing' - 'mplayer-vaapi-libre: Needed for subtitle vobsub viewing' + 'mplayer: Needed for subtitle vobsub viewing' + 'mplayer-vaapi: Needed for subtitle vobsub viewing' 'mplayer2: Needed for subtitle vobsub viewing' 'ogmtools: Needed for OGG/Vorbis and for chapter progress bar' 'xine-ui: Can be used to view DVD'\''s/files' diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 17a9da2b9..4920c20e3 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -28,7 +28,7 @@ fi optdepends=('networkmanager: Location detection via available WiFi networks' 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' 'gstreamer0.10-good-plugins: webm and mp4 demuxing' - 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-bad-plugins: aac, vp8 and opus decoding' 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding' 'gstreamer0.10-ffmpeg: more decoders' 'libpulse: PulseAudio audio driver') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index ad6233f39..6d49588e8 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -23,7 +23,7 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -39,7 +39,7 @@ fi optdepends=('networkmanager: Location detection via available WiFi networks' 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' 'gstreamer0.10-good-plugins: webm and mp4 demuxing' - 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-bad-plugins: aac, vp8 and opus decoding' 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding' 'gstreamer0.10-ffmpeg: more decoders' 'libpulse: PulseAudio audio driver') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 6dd3bc747..6a9a4a394 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=liferea pkgname=liferea-libre pkgver=1.10.5 -pkgrel=1 +pkgrel=1.1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -21,7 +21,7 @@ optdepends=('gnome-keyring: for keyring plugin support' 'libgnome-keyring: for keyring plugin support' 'gst-plugins-base: for media player plugin support' 'gst-plugins-good: for media player plugin support' - 'gst-plugins-bad-libre: for media player plugin support') + 'gst-plugins-bad: for media player plugin support') options=('!emptydirs') install=liferea.install source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 5ee62dc03..d3dc06cb1 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -6,11 +6,11 @@ pkgname=texlive-core-libre _pkgname=texlive-core pkgver=2013.31589 _revnr=${pkgver#2013.} -pkgrel=1.1 +pkgrel=1.2 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)" license=('GPL') arch=(any) -depends=('texlive-bin-libre' 'perl') +depends=('texlive-bin' 'perl') optdepends=( 'ruby: for old ConTeXT MkII and epspdf' 'tk: for texdoctk' diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD index dfbd783c7..1f750dfc4 100644 --- a/libre/wings3d-libre/PKGBUILD +++ b/libre/wings3d-libre/PKGBUILD @@ -7,14 +7,14 @@ _name=wings _pkgname=${_name}3d pkgname=$_pkgname-libre pkgver=1.5.2 -pkgrel=1 +pkgrel=1.1 pkgdesc='3D modeling program, without nonfree kerkythea render support' arch=('x86_64' 'i686' 'mips64el') url='http://www.wings3d.com/' license=('GPL') depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang') makedepends=('gendesk') -optdepends=('povray-libre: rendering support via POV-Ray') +optdepends=('povray: rendering support via POV-Ray') provides=("$_pkgname") conflicts=("$_pkgname") replaces=("$_pkgname") diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 623914f4e..a565c8421 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=8 +pkgrel=8.1 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -25,7 +25,7 @@ depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'lirc-libre: remote controller support' + 'lirc: remote controller support' 'udisks: automount external drives' 'upower: used to trigger power management functionality' 'libarchive: access compressed files without unpacking them' -- cgit v1.2.3 From 5ad7dfc704ddb930cc62207154287b03174e5873 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 19:10:38 -0200 Subject: lirc-libre: rename lirc-utils-libre to lirc-libre-utils on lirc-libre depends --- libre/lirc-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 277f31c7c..a4d18fe86 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-libre-utils') pkgver=0.9.0 -pkgrel=69 +pkgrel=69.1 epoch=1 _extramodules=extramodules-3.12-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -84,7 +84,7 @@ build() { package_lirc-libre() { pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)" - depends=('lirc-utils-libre' 'linux-libre>=3.12' 'linux-libre<3.13') + depends=('lirc-libre-utils' 'linux-libre>=3.12' 'linux-libre<3.13') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") -- cgit v1.2.3 From b99281f573876a166cedd30b4f8347a9c3333363 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 19:21:05 -0200 Subject: oss-libre: fix description --- libre/oss-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD index 2ef42613a..7d1777b43 100644 --- a/libre/oss-libre/PKGBUILD +++ b/libre/oss-libre/PKGBUILD @@ -7,7 +7,7 @@ pkgname=oss-libre pkgver=4.2_2007 -pkgrel=4 +pkgrel=4.1 arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') @@ -81,8 +81,8 @@ build() { } package() { - pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation (built for the linux-libre-headers package)" - depends=('gcc' 'make' 'linux-libre-headers' 'libtool' 'sed') + pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation" + depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') optdepends=('gtk2: for graphical mixer (ossxmix)') replaces=('oss') conflicts=('oss' 'oss-linux' 'oss-linux-free' 'oss-testing') -- cgit v1.2.3 From 7b45df07a3487ead641ecbf075a0e888b3a24397 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 19:22:38 -0200 Subject: lirc-libre: fix description on lirc-libre-utils --- libre/lirc-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index a4d18fe86..66ca49ac6 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -100,7 +100,7 @@ package_lirc-libre() { } package_lirc-libre-utils() { - pkgdesc="Linux Infrared Remote Control utils" + pkgdesc="Linux Infrared Remote Control utils (built for the linux-libre kernel package)" depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip') -- cgit v1.2.3 From f4fcfe83ea117c4091b4ae66b57697f1e6db52a3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 31 Jan 2014 19:47:57 -0200 Subject: remove ipsec-tools-libre and tomoyo-tools-libre because doesn't needs be rebuilt against our kernels and headers to works well --- libre/ipsec-tools-libre/PKGBUILD | 48 --------------------- .../ipsec-tools-linux-3.7-compat.patch | 50 ---------------------- libre/ipsec-tools-libre/ipsec.service | 12 ------ libre/ipsec-tools-libre/racoon.service | 10 ----- libre/tomoyo-tools-libre/PKGBUILD | 42 ------------------ libre/tomoyo-tools-libre/tomoyo-tools.install | 11 ----- 6 files changed, 173 deletions(-) delete mode 100644 libre/ipsec-tools-libre/PKGBUILD delete mode 100644 libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch delete mode 100644 libre/ipsec-tools-libre/ipsec.service delete mode 100644 libre/ipsec-tools-libre/racoon.service delete mode 100644 libre/tomoyo-tools-libre/PKGBUILD delete mode 100644 libre/tomoyo-tools-libre/tomoyo-tools.install (limited to 'libre') diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD deleted file mode 100644 index eb7a846bb..000000000 --- a/libre/ipsec-tools-libre/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 100177 2013-11-01 20:59:04Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Allan Henriksen -# Maintainer (Parabola): André Silva - -_pkgname=ipsec-tools -pkgname=ipsec-tools-libre -pkgver=0.8.1 -pkgrel=5 -pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)" -arch=('i686' 'x86_64' 'mips64el') -url="http://ipsec-tools.sourceforge.net/" -depends=('readline' 'openssl' 'krb5') -makedepends=('linux-libre-headers') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -license=('GPL') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2 - racoon.service - ipsec.service - ipsec-tools-linux-3.7-compat.patch) -md5sums=('d38b39f291ba2962387c3232e7335dd8' - '3a64a9e3b498c6da90450ffb0b758aea' - '387a0b0c4f10e42b2bb62282885cdc9c' - 'ae1dd20c83dcfce3dedb46ee73e83613') - -build() { - cd $srcdir/$_pkgname-$pkgver - - patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch - sed -i 's#-Werror##' configure.ac - - ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ - --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport --enable-gssapi \ - --with-kernel-headers=/lib/modules/`pacman -Q linux-libre-headers | cut -f2 -d\ `-LIBRE/build/include - make -} - -package() { - cd $srcdir/$_pkgname-$pkgver - make DESTDIR=$pkgdir install - install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service - install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service -} diff --git a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch deleted file mode 100644 index 46b11ee51..000000000 --- a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -74,9 +74,10 @@ case "$host_os" in - [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) - - AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , -- [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, -- KERNEL_INCLUDE=/usr/src/linux/include , -- [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) -+ [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , -+ [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, -+ KERNEL_INCLUDE=/usr/src/linux/include , -+ [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) - AC_SUBST(KERNEL_INCLUDE) - # We need the configure script to run with correct kernel headers. - # However we don't want to point to kernel source tree in compile time, -@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes, - #ifdef SADB_X_EXT_NAT_T_TYPE - yes - #endif --], [kernel_natt="yes"]) -+], [kernel_natt="yes"], [ -+ AC_EGREP_CPP(yes, -+ [#include -+ #ifdef SADB_X_EXT_NAT_T_TYPE -+ yes -+ #endif -+ ], [kernel_natt="yes"]) -+]) - ;; - freebsd*|netbsd*) - # NetBSD case ---- a/src/include-glibc/Makefile.am -+++ b/src/include-glibc/Makefile.am -@@ -1,14 +1,7 @@ -- --.includes: ${top_builddir}/config.status -- ln -snf $(KERNEL_INCLUDE)/linux -- touch .includes -- --all: .includes -- - EXTRA_DIST = \ - glibc-bugs.h \ - net/pfkeyv2.h \ - netinet/ipsec.h \ - sys/queue.h - --DISTCLEANFILES = .includes linux -+DISTCLEANFILES = linux diff --git a/libre/ipsec-tools-libre/ipsec.service b/libre/ipsec-tools-libre/ipsec.service deleted file mode 100644 index 483a5b58d..000000000 --- a/libre/ipsec-tools-libre/ipsec.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Load IPSec Security Policy Database -After=syslog.target network.target - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/bin/setkey -f /etc/ipsec.conf -ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F - -[Install] -WantedBy=multi-user.target diff --git a/libre/ipsec-tools-libre/racoon.service b/libre/ipsec-tools-libre/racoon.service deleted file mode 100644 index 95324bd5d..000000000 --- a/libre/ipsec-tools-libre/racoon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Racoon IKEv1 key management daemon for IPSEC -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/bin/racoon - -[Install] -WantedBy=multi-user.target diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD deleted file mode 100644 index ad0306918..000000000 --- a/libre/tomoyo-tools-libre/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 96508 2013-08-30 20:31:24Z foutrelis $ -# Maintainer: Sergej Pupykin -# Maintainer: Jamie Nguyen -# Maintainer (Parabola): André Silva - -_pkgname=tomoyo-tools -pkgname=tomoyo-tools-libre -_basever=2.5.0 -_timestamp=20130406 -_file=53357 -pkgver=${_basever}.${_timestamp} -pkgrel=2 -pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)' -arch=('i686' 'x86_64' 'mips64el') -url='http://tomoyo.sourceforge.jp' -#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' -license=('GPL') -depends=('ncurses' 'linux-libre>=3.2') -replaces=${_pkgname} -conflicts=${_pkgname} -provides=${_pkgname}=${pkgver} -install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('8888f83fcb87823d714ff551e8680d0d') - -prepare() { - cd "${srcdir}/${_pkgname}" - sed -i \ - -e 's|usr/sbin|usr/bin|g' \ - -e 's|sbin|usr/bin|g' \ - usr_lib_tomoyo/init_policy.c -} - -build() { - cd "${srcdir}/${_pkgname}" - make USRSBINDIR=/usr/bin SBINDIR=/usr/bin -} - -package() { - cd "${srcdir}/${_pkgname}" - make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install -} diff --git a/libre/tomoyo-tools-libre/tomoyo-tools.install b/libre/tomoyo-tools-libre/tomoyo-tools.install deleted file mode 100644 index c23df1212..000000000 --- a/libre/tomoyo-tools-libre/tomoyo-tools.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - echo - echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' to the kernel" - echo " boot options and initialize policy with this command:" - echo " /usr/lib/tomoyo/init_policy" - echo -} - -post_upgrade () { - post_install $1 -} -- cgit v1.2.3 From d1d227432dbb159f6cf3365559bf6630c5f1d2fe Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 1 Feb 2014 02:45:15 -0200 Subject: acpi_call-libre{,-lts}: add new packages on [libre] --- libre/acpi_call-libre-lts/PKGBUILD | 44 ++++++++++++++++++++++++++++ libre/acpi_call-libre-lts/acpi_call.install | 14 +++++++++ libre/acpi_call-libre/PKGBUILD | 45 +++++++++++++++++++++++++++++ libre/acpi_call-libre/acpi_call.install | 14 +++++++++ 4 files changed, 117 insertions(+) create mode 100644 libre/acpi_call-libre-lts/PKGBUILD create mode 100644 libre/acpi_call-libre-lts/acpi_call.install create mode 100644 libre/acpi_call-libre/PKGBUILD create mode 100644 libre/acpi_call-libre/acpi_call.install (limited to 'libre') diff --git a/libre/acpi_call-libre-lts/PKGBUILD b/libre/acpi_call-libre-lts/PKGBUILD new file mode 100644 index 000000000..3e14d035e --- /dev/null +++ b/libre/acpi_call-libre-lts/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 104847 2014-01-27 15:09:28Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: mortzu +# Contributor: fnord0 + +_pkgname=acpi_call-lts +pkgname=acpi_call-libre-lts +pkgver=1.1.0 +pkgrel=1 +_extramodules=extramodules-3.10-LIBRE-LTS +pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre-lts kernel package)' +arch=('i686' 'x86_64') +url="http://github.com/mkottman/${_pkgname%-*}" +license=('GPL') +depends=('linux-libre-lts>=3.10.26') +makedepends=('linux-libre-lts-headers>=3.10.26') +replaces="${_pkgname}" +conflicts="${_pkgname}" +provides=("${_pkgname%-*}" "${_pkgname}=${pkgver}") +install="${_pkgname%-*}.install" +source=("${url}/archive/v${pkgver}.tar.gz") +sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') + +build() { + cd ${_pkgname%-*}-${pkgver} + + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + + make KVERSION="${_kernver}" +} + +package() { + cd ${_pkgname%-*}-${pkgver} + + install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d} + install -m 644 ${_pkgname%-*}.ko "${pkgdir}"/usr/lib/modules/${_extramodules} + gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname%-*}.ko + echo ${_pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname%-*}.conf + + install -dm 755 "${pkgdir}"/usr/share/${_pkgname%-*} + cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname%-*}/ +} + +# vim: ts=2 sw=2 et: diff --git a/libre/acpi_call-libre-lts/acpi_call.install b/libre/acpi_call-libre-lts/acpi_call.install new file mode 100644 index 000000000..b0b89c675 --- /dev/null +++ b/libre/acpi_call-libre-lts/acpi_call.install @@ -0,0 +1,14 @@ +post_install() { + _extramodules=extramodules-3.10-LIBRE-LTS + depmod $(cat /usr/lib/modules/${_extramodules}/version) +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD new file mode 100644 index 000000000..11dffa3b3 --- /dev/null +++ b/libre/acpi_call-libre/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 104849 2014-01-27 15:16:44Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: mortzu +# Contributor: fnord0 +# Maintainer (Parabola): André Silva + +_pkgname=acpi_call +pkgname=acpi_call-libre +pkgver=1.1.0 +pkgrel=1 +_extramodules=extramodules-3.12-LIBRE +pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)' +arch=('i686' 'x86_64') +url="http://github.com/mkottman/${_pkgname}" +license=('GPL') +depends=('linux-libre>=3.12' 'linux-libre<3.13') +makedepends=('linux-libre-headers>=3.12' 'linux-libre-headers<3.13') +replaces="${_pkgname}" +conflicts="${_pkgname}" +provides="${_pkgname}=${pkgver}" +install="${_pkgname}.install" +source=("${url}/archive/v${pkgver}.tar.gz") +sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') + +build() { + cd ${_pkgname}-${pkgver} + + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + + make KVERSION="${_kernver}" +} + +package() { + cd ${_pkgname}-${pkgver} + + install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d} + install -m 644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules} + gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko + echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname}.conf + + install -dm 755 "${pkgdir}"/usr/share/${_pkgname} + cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname}/ +} + +# vim: ts=2 sw=2 et: diff --git a/libre/acpi_call-libre/acpi_call.install b/libre/acpi_call-libre/acpi_call.install new file mode 100644 index 000000000..7b1ca908d --- /dev/null +++ b/libre/acpi_call-libre/acpi_call.install @@ -0,0 +1,14 @@ +post_install() { + _extramodules=extramodules-3.12-LIBRE + depmod $(cat /usr/lib/modules/${_extramodules}/version) +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: -- cgit v1.2.3 From 64e61b083b1c144cd7e3ef4018f14d7127aa4a24 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 1 Feb 2014 04:10:24 -0200 Subject: remove "-libre" suffix on makedepends, depends and optdepends on more packages to avoid break dependencies on the future --- libre/icedove-libre/PKGBUILD | 2 +- nonprism/choqok-nonprism/PKGBUILD | 4 ++-- nonprism/icedove-libre-nonprism/PKGBUILD | 2 +- pcr/imagemagick-srv/PKGBUILD | 6 +++--- pcr/mitsuba/PKGBUILD | 4 ++-- pcr/ryzom-data/PKGBUILD | 2 +- pcr/yafaray/PKGBUILD | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libre') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index b21733dd6..9409190c8 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD index cf5c374b0..a4db0e5b6 100644 --- a/nonprism/choqok-nonprism/PKGBUILD +++ b/nonprism/choqok-nonprism/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=choqok pkgname=choqok-nonprism pkgver=1.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="A status.net client for KDE, without Twitter support" url='http://choqok.gnufolks.org/' license=('GPL') @@ -18,7 +18,7 @@ provides=("$_pkgname=$pkgver") conflicts=$_pkgname depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') makedepends=('cmake' 'automoc4') -optdepends=('kdebase-konqueror-libre: proxy support') +optdepends=('kdebase-konqueror: proxy support') install="${_pkgname}.install" source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.xz") md5sums=('2efe34ed903b448a21d9233d8033dbdb') diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD index 36d5497dd..196536ea0 100644 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ b/nonprism/icedove-libre-nonprism/PKGBUILD @@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird' "${pkgname%-nonprism}") conflicts=('thunderbird' "${pkgname%-nonprism}") diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD index 9dc9c4cb2..bda2c27c3 100644 --- a/pcr/imagemagick-srv/PKGBUILD +++ b/pcr/imagemagick-srv/PKGBUILD @@ -5,15 +5,15 @@ pkgbase=imagemagick pkgname=imagemagick-srv pkgver=6.8.6.8 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') provides=("$pkgbase=$pkgver") conflicts=$pkgbase replaces=$pkgbase -makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \ - 'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \ +makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \ 'libwebp') # libcl opencl-headers #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index d8e12a3b9..01fb7a47f 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=mitsuba _pkgver=0.4.4 -_pkgrel=5 +_pkgrel=5.1 _bldname=blender _bldver=2.69 _bldep=10 @@ -34,7 +34,7 @@ depends=( collada-dom glew libxxf86vm - openexr-libre + openexr qt4 xerces-c ) diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD index dfb8a116c..9f33a6794 100644 --- a/pcr/ryzom-data/PKGBUILD +++ b/pcr/ryzom-data/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 arch=('any') url="http://media.ryzom.com/" license=('CCPL:by-sa') -makedepends=('rsync' 'p7zip-libre') +makedepends=('rsync' 'p7zip') conflicts=('ryzom-data') pkgdesc="An awesome free software 3D MMORPG game. Game data." source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata") diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index 1db06b6a9..c27f6c587 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=yafaray _pkgver=1.5 -_pkgrel=1 +_pkgrel=1.1 _pkgdate=20130921 _bldname=blender _bldver=2.69 @@ -36,7 +36,7 @@ depends=( freetype2 libjpeg libxml2 - openexr-libre + openexr ) optdepends=( 'python: Python bindings' -- cgit v1.2.3