diff options
| author | Drtan Samos <lashdu@drtan.twilightparadox.com> | 2014-03-03 18:49:15 +0100 |
|---|---|---|
| committer | Drtan Samos <lashdu@drtan.twilightparadox.com> | 2014-03-03 18:49:15 +0100 |
| commit | 926e54e67433d33d75b19b21544c5b8303389aa0 (patch) | |
| tree | 6177f2e93611ffba8ef822da12850bf3565d7766 /libre | |
| parent | c850156e865805296b73eee01caa4b4469191437 (diff) | |
| parent | 535ef7c5859bc88ca3a0d382261632ec8d8df066 (diff) | |
| download | abslibre-926e54e67433d33d75b19b21544c5b8303389aa0.tar.gz abslibre-926e54e67433d33d75b19b21544c5b8303389aa0.tar.bz2 abslibre-926e54e67433d33d75b19b21544c5b8303389aa0.zip | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre')
29 files changed, 527 insertions, 464 deletions
diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD index a17f070ae..4b69536c8 100644 --- a/libre/antlr2/PKGBUILD +++ b/libre/antlr2/PKGBUILD @@ -6,11 +6,11 @@ pkgbase=antlr2 pkgname=(antlr2 antlr2-{java,python2,cxx,sharp}) pkgver=2.7.7 -pkgdesc="ANother Tool for Language Recognition" +pkgdesc="Another Tool for Language Recognition" url="http://www.antlr2.org/" license=('custom:Public Domain') -pkgrel=5.1 # newer than Arch's 2.7.7-5 +pkgrel=6 arch=('i686' 'x86_64') options=('staticlibs') makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh') @@ -24,11 +24,14 @@ md5sums=('01cc9a2a454dd33dcd8c856ec89af090' '158677e4c0f357afbb56656231a54815' '0d1960d27ff81f2fea0dd35a8290216f') -build() { +prepare() { cd "${srcdir}/antlr-${pkgver}" - patch -Np1 -i "${srcdir}"/gcc4.4.patch patch -Np1 -i "${srcdir}"/mono.patch +} + +build() { + cd "${srcdir}/antlr-${pkgver}" ./configure --prefix=/usr --disable-examples make -j1 diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index eb98f4aa9..01f21dc28 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103233 2013-12-30 17:04:09Z tredaelli $ +# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.9.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ url='https://bitcointalk.org/index.php?topic=168174.0' license=('GPL3') source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('4250ec5ccb0fd9bd8c6d35608b13b3e2f07857e46abc09b94514a2fd2af80f40' +sha256sums=('12458aed84abc4a953532fe0645772492701e5d627f56f62d382aa0f458a10d5' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { @@ -31,12 +31,12 @@ build() { cd "$srcdir"/$_pkgname-$pkgver ./configure --prefix=/usr \ - --enable-cpumining \ - --enable-bfsb \ - --enable-metabank \ - --enable-scrypt \ - --enable-opencl \ - --with-udevrulesdir=/usr/lib/udev/rules.d + --enable-cpumining \ + --enable-bfsb \ + --enable-metabank \ + --enable-scrypt \ + --enable-opencl \ + --with-udevrulesdir=/usr/lib/udev/rules.d # --enable-knc (FS#33640) make } diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index cb6ac5238..0a1502d15 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106016 2014-02-21 08:27:06Z jelle $ +# $Id: PKGBUILD 106341 2014-02-28 10:31:18Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.25.0 +pkgver=1.26.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,8 +30,8 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('66151757e67a9d0abdb0fd3b7e91614e' - '8e1855ce1ae254c34d12ddbc358b7a36' +md5sums=('530485d30087c569c604df1c7e2b3d3a' + 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index da3c7a52e..f1a66c020 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,7 +1,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py ---- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100 -+++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100 -@@ -451,18 +451,6 @@ +--- calibre/src/calibre/linux.py 2014-02-28 04:06:35.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2014-02-28 11:18:00.518362669 +0100 +@@ -495,18 +495,6 @@ self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() @@ -19,8 +19,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - os.rmdir(config_dir) if warn is None and self.warnings: - self.info('There were %d warnings'%len(self.warnings)) -@@ -513,7 +501,7 @@ + self.info('\n\nThere were %d warnings\n'%len(self.warnings)) +@@ -564,7 +552,7 @@ if isnetbsd: f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') else: @@ -28,8 +28,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py + f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) - if zsh.dest: -@@ -657,56 +645,37 @@ + bash_comp_dest, zsh_comp_dest = f, None +@@ -713,56 +701,37 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -53,13 +53,13 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py - self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) - render_img('lt.png', 'calibre-gui.png', width=256, height=256) - cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) -- self.icon_resources.append(('apps', 'calibre-gui', '128')) -- render_img('viewer.png', 'calibre-viewer.png') -- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) -- self.icon_resources.append(('apps', 'calibre-viewer', '128')) -- render_img('tweak.png', 'calibre-ebook-edit.png') -- cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True) -- self.icon_resources.append(('apps', 'calibre-ebook-edit', '128')) +- self.icon_resources.append(('apps', 'calibre-gui', '256')) +- render_img('viewer.png', 'calibre-viewer.png', width=256, height=256) +- cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '256')) +- render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256) +- cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True) +- self.icon_resources.append(('apps', 'calibre-ebook-edit', '256')) + dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') + os.mkdir(dir) + render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) @@ -99,22 +99,3 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py f.write(GUI) write_mimetypes(f) f.close() -@@ -725,15 +694,9 @@ - translators = dict(get_all_translators()) - - APPDATA = get_appdata() -- for x in des: -- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] -- cc(' '.join(cmd), shell=True) -- self.menu_resources.append(x) -- ak = x.partition('.')[0] -- if ak in APPDATA and os.access(appdata, os.W_OK): -- write_appdata(ak, APPDATA[ak], appdata, translators) -- cc(['xdg-desktop-menu', 'forceupdate']) -- f = open('calibre-mimetypes.xml', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') -+ os.makedirs(dir) -+ f = open(os.path.join(dir, 'calibre.xml'), 'wb') - f.write(MIME) - f.close() - self.mime_resources.append('calibre-mimetypes.xml') diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index e74b26c45..4468b7832 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103980 2014-01-14 12:52:23Z jgc $ +# $Id: PKGBUILD 106122 2014-02-23 15:32:14Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: BlackEagle <ike.devolder@gmail.com> @@ -9,8 +9,8 @@ _pkgname=clementine pkgname=clementine-libre -pkgver=1.2.1 -pkgrel=2.1 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') @@ -26,17 +26,19 @@ replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") install=clementine.install -mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" +mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz" 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e' - '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db' +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "${_pkgname}-unistd.patch") +mksha256sums=('1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96' + '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') -sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2') +sha256sums=('02d799056435f244a319eea110672c404c8804a2418677253d5cdd4ea01a340f' + 'bb02f82c3bcdad542396fc0788010321d618fc0545d34d00fee63bed987a0bbf') mksource() { - cd ${_pkgname}-${pkgver} + cd Clementine-${pkgver} # remove nonfree nonfree artwork and spotify references on files patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch @@ -61,8 +63,14 @@ mksource() { touch data/schema/schema-30.sql } +prepare() { + cd Clementine-${pkgver} + + patch -Np1 -i ../${_pkgname}-unistd.patch +} + build() { - cd ${_pkgname}-${pkgver} + cd Clementine-${pkgver} if [[ -d build ]]; then rm -rf build @@ -74,7 +82,7 @@ build() { } package() { - cd ${_pkgname}-${pkgver}/build + cd Clementine-${pkgver}/build make DESTDIR="${pkgdir}" install } diff --git a/libre/clementine-libre/clementine-unistd.patch b/libre/clementine-libre/clementine-unistd.patch new file mode 100644 index 000000000..9bd053b60 --- /dev/null +++ b/libre/clementine-libre/clementine-unistd.patch @@ -0,0 +1,11 @@ +diff -rupN Clementine-1.2.2.orig/src/core/utilities.cpp Clementine-1.2.2/src/core/utilities.cpp +--- Clementine-1.2.2.orig/src/core/utilities.cpp 2014-02-23 16:14:06.919406700 +0100 ++++ Clementine-1.2.2/src/core/utilities.cpp 2014-02-23 16:16:12.107064900 +0100 +@@ -50,6 +50,7 @@ + #endif + + #ifdef Q_OS_LINUX ++# include <unistd.h> + # include <sys/syscall.h> + #endif + #ifdef Q_OS_DARWIN diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 38bac21bf..8c1b9aafd 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -157,52 +157,6 @@ index e054619..3568a6f 100755 for plugin in QT_PLUGINS: FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) -diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi -index 038a60b..1d29a9e 100644 ---- a/dist/windows/clementine.nsi -+++ b/dist/windows/clementine.nsi -@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles - Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll" - -- ; 1.0 prerelease -- Delete "$INSTDIR\spotify.dll" -- - ; 1.0 - Delete "$INSTDIR\libofa.dll" - Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll" -@@ -128,7 +125,6 @@ Section "Clementine" Clementine - File "avutil-51.dll" - File "clementine.exe" - File "clementine-tagreader.exe" -- File "clementine-spotifyblob.exe" - File "clementine.ico" - File "glew32.dll" - File "intl.dll" -@@ -181,7 +177,6 @@ Section "Clementine" Clementine - File "libqjson.dll" - File "libsoup-2.4-1.dll" - File "libspeex-1.dll" -- File "libspotify.dll" - File "libstdc++-6.dll" - File "libtag.dll" - File "libtasn1-3.dll" -@@ -939,7 +934,6 @@ Section "Uninstall" - Delete "$INSTDIR\clementine.ico" - Delete "$INSTDIR\clementine.exe" - Delete "$INSTDIR\clementine-tagreader.exe" -- Delete "$INSTDIR\clementine-spotifyblob.exe" - Delete "$INSTDIR\glew32.dll" - Delete "$INSTDIR\intl.dll" - Delete "$INSTDIR\libcdio-14.dll" -@@ -992,7 +986,6 @@ Section "Uninstall" - Delete "$INSTDIR\libqjson.dll" - Delete "$INSTDIR\libsoup-2.4-1.dll" - Delete "$INSTDIR\libspeex-1.dll" -- Delete "$INSTDIR\libspotify.dll" - Delete "$INSTDIR\libstdc++-6.dll" - Delete "$INSTDIR\libtag.dll" - Delete "$INSTDIR\libtasn1-3.dll" diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in index 750b332..6bf47ff 100644 --- a/dist/windows/clementine.nsi.in diff --git a/libre/handbrake-svn/PKGBUILD b/libre/handbrake-svn/PKGBUILD new file mode 100644 index 000000000..5166674d2 --- /dev/null +++ b/libre/handbrake-svn/PKGBUILD @@ -0,0 +1,171 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com> +# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> +# Contributor (Arch): Sebastien Piccand <sebcactus gmail com> + +pkgname=('handbrake-svn' 'handbrake-cli-svn') +_pkgver=0.9.9.1 +pkgver=6019 +url="http://handbrake.fr/" +license=('GPL') + +pkgrel=5 +arch=('i686' 'x86_64') +makedepends=('intltool' 'python2' 'gcc-libs' 'libnotify' + 'gst-plugins-base' 'gtk3' 'dbus-glib') + +# The format is: handbrake_name:[system_name|tarball] +# This list should pretty closely correspond to `grep contrib/ make/include/main.defs` +# _config_loc +# format: "ignored:pacman_pkgname" +# For packages that optionally use the system's versions. The +# build system is not modified, in order that if the module version +# is used, it fails early (assuming the network is down). +# _config_mod +# format: "module_name:file_name" +# For packages that are built as modules. +# _config_sys +# format: "module_name:pacman_pkgname" +# For modules that we *force* to be the system versions. +# _config_ign +# format: "ignored" +# For modules that are optional, but we don't want to download. +declare -ag _contrib_{loc,sys,mod,ign} +_contrib_loc+=('pkgconfig') # FEATURE.local_pkgconfig +_contrib_loc+=('autoconf' # FEATURE.local_autotools + 'automake' + 'libtool' + 'm4') +# a52dec is patched to make private things public +_contrib_mod+=('a52dec:a52dec-0.7.4.tar.gz') # always +_contrib_loc+=('bzip2') # HAS.bz2 +_contrib_loc+=('fontconfig' + 'freetype:freetype2' + 'fribidi' + 'libxml2' + 'libass' + 'libogg' + 'libvorbis' + 'libtheora' + 'libsamplerate') +#_contrib_sys+=('fdk-aac:libfdk-aac') # FEATURE.fdk_aac +_contrib_mod+=('fdk-aac:fdk-aac-v0.1.1-6-gbae4553.tar.bz2') # FEATURE.fdk_aac +_contrib_ign+=('faac') # FEATURE.faac +#_contrib_sys+=('mp4v2:libmp4v2') # FEATURE.mp4v2 +_contrib_mod+=('mp4v2:mp4v2-trunk-r355.tar.bz2') # FEATURE.mp4v2 +# libmkv is patched to add features +_contrib_mod+=('libmkv:libmkv-0.6.5-0-g82075ae.tar.gz') # FEATURE.libmkv +_contrib_sys+=('lame') # always +# Using system ffmpeg will break PGS subtitle processing +# https://forum.handbrake.fr/viewtopic.php?f=13&t=27581 +_contrib_mod+=('ffmpeg:libav-v10_alpha2.tar.bz2') # always +_contrib_sys+=('libdvdread') # always +# I don't even know, but system libdvdnav doesn't work +_contrib_mod+=('libdvdnav:libdvdnav-a5c1325.tar.bz2') # always +_contrib_sys+=('libbluray') # # always +_contrib_ign+=('libmfx') # FEATURE.qsv +_contrib_sys+=('x264') # always +_contrib_loc+=('zlib') # HAS.libz +_contrib_loc+=('yasm') # FEATURE.local_yasm + +makedepends+=("${_contrib_loc[@]#*:}" "${_contrib_sys[@]#*:}") + +source=("https://repo.parabolagnulinux.org/other/$pkgname/HandBrake-svn${pkgver}.tar.gz") +for _f in "${_contrib_mod[@]#*:}"; do + source+=("http://download.handbrake.fr/handbrake/contrib/${_f}") + noextract+=("${_f}") +done; unset _f +sha256sums=('098c2e5cad18784d3b9ac164891c87770eba055e6508bbc70d73680862473208' + '54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47' + 'f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc' + '5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f' + '7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97' + '83e7f34585160a90f3c218a485e02a22a54b2fd4f1b025589bd210820dcf637e' + 'd190ce2ca4d1d9878145acd9c1b8ac76636c3b6d12066e8cc87ee674f943fb2a') + +mksource=("HandBrake-svn${pkgver}::svn://svn.handbrake.fr/HandBrake/trunk") +mkmd5sums=('SKIP') + +prepare() { + cd "$srcdir/HandBrake-svn$pkgver" + + # Use Python 2 + sed -i 's/python /python2 /' gtk/src/Makefile.am + + local contrib + # Use more system libs + for contrib in "${_contrib_sys[@]}"; do + sed -i \ + -e "s/MODULES += contrib\/${contrib%:*}\$/#& # provided by ${contrib#*:}/" \ + make/include/main.defs + done + # Use the pre-downloaded files + mkdir -p download + for contrib in "${_contrib_mod[@]}"; do + ln -srf "${srcdir}/${contrib[@]#*:}" download/ + done + + # Fix libhb to work with the stable release of libmp4v2 + if in_array libmp4v2 "${makedepends[@]}"; then + local arg='\([^,)]*\)' + sed -i \ + -e "s/MP4Close(${arg})/MP4Close(\1, 0)/" \ + -e "s/MP4Create(${arg},${arg},${arg})/MP4Create(\1,\3)/" \ + -e "s/MP4Optimize(${arg},${arg},${arg})/MP4Optimize(\1,\2)/" \ + -e "s/MP4Read(${arg},${arg})/MP4Read(\1)/" \ + libhb/decmetadata.c libhb/muxmp4.c + fi + + # Fix configure.ac to work with automake 1.13 + if in_array automake "${makedepends[@]}"; then + cd gtk + sed -i \ + -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ + -e '/AM_PROG_CC_STDC/d' \ + -e 's/$pkg_gudev"/gmodule-2.0 $pkg_gudev"/' \ + configure.ac + autoreconf -vi + fi +} + +build() { + cd "$srcdir/HandBrake-svn$pkgver" + + ./configure \ + --prefix=/usr \ + --force \ + --disable-gtk-update-checks + cd build + make -j1 +} + +package_handbrake-svn() { + pkgdesc="Multithreaded video transcoder" + depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib' + 'fribidi' 'libass' 'gtk3' 'fontconfig' 'freetype2' 'libxml2' + 'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libbluray' + 'x264' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('gst-plugins-good: for video previews' + 'gst-libav: for video previews') + install=$pkgname.install + provides=("${pkgname%-svn}-${_pkgver}") + conflicts=("${pkgname%-svn}") + + cd "$srcdir/HandBrake-svn$pkgver/build" + + make -j1 DESTDIR="$pkgdir" install + rm "$pkgdir/usr/bin/HandBrakeCLI" +} + +package_handbrake-cli-svn() { + pkgdesc="Multithreaded video transcoder (CLI)" + depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'libxml2' 'libtheora' + 'libsamplerate' 'libbluray' 'x264') + provides=("${pkgname%-svn}-${_pkgver}") + conflicts=("${pkgname%-svn}") + + cd "$srcdir/HandBrake-svn$pkgver/build" + install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/handbrake-svn/handbrake-svn.install b/libre/handbrake-svn/handbrake-svn.install new file mode 100644 index 000000000..87c29e4db --- /dev/null +++ b/libre/handbrake-svn/handbrake-svn.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index b1ccb3b09..412535caf 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 104302 2014-01-17 11:39:31Z spupykin $ +# $Id: PKGBUILD 106267 2014-02-26 10:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - pkgname=icecat-adblock-plus -pkgver=2.4.1 -_addons_file=230225 -pkgrel=1.1 +pkgver=2.5.1 +_addons_file=244872 +pkgrel=1 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -15,7 +14,7 @@ makedepends=('unzip') provides=(firefox-adblock-plus=$pkgver) noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('3fe51813290a0d7103b620e2813a8c0e') +md5sums=('7e1c072961be0d108c81ab91bd89d687') package() { # _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.` diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 0a248955b..5d30cd52c 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 104302 2014-01-17 11:39:31Z spupykin $ +# $Id: PKGBUILD 106267 2014-02-26 10:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - pkgname=iceweasel-adblock-plus -pkgver=2.4.1 -_addons_file=230225 -pkgrel=1.1 +pkgver=2.5.1 +_addons_file=244872 +pkgrel=1 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -15,7 +14,7 @@ makedepends=('unzip') provides=(firefox-adblock-plus=$pkgver) noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('3fe51813290a0d7103b620e2813a8c0e') +md5sums=('7e1c072961be0d108c81ab91bd89d687') package() { # _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.` diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 6a9a4a394..a7726f329 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 204300 2014-01-16 22:28:49Z eric $ +# $Id: PKGBUILD 206376 2014-02-25 09:02:19Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.5 -pkgrel=1.1 +pkgver=1.10.6 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -24,9 +24,9 @@ optdepends=('gnome-keyring: for keyring 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 +source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('a2378f2ba117fcc6475f82d961515adc367ef535' +sha1sums=('af339c6c214092bbfd583673c714ea64cf4d9866' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index aed04e4aa..2e76ad716 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206183 2014-02-21 10:15:31Z bpiotrowski $ +# $Id: PKGBUILD 206261 2014-02-23 10:06:10Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -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=31 +_sublevel=32 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.30 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.31 # 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.xz") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '36a430003252c2f5e7a6f8e3365871ca' + 'e344eea547efba42562dd8ff16593116' '85ce008eaacbb2fc54b81116d35cf946' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '8e0bb5cbd34b0e7391049eba25d135be') + 'bfac14a0d1a3a0b0fbf09ba3a0ff6e88') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/0001-quirk-asm_volatile_goto.patch b/libre/linux-libre/0001-quirk-asm_volatile_goto.patch deleted file mode 100644 index c9ee40400..000000000 --- a/libre/linux-libre/0001-quirk-asm_volatile_goto.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001 -From: Steven Noonan <steven@uplinklabs.net> -Date: Thu, 13 Feb 2014 07:01:07 +0000 -Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional - -I started noticing problems with KVM guest destruction on Linux -3.12+, where guest memory wasn't being cleaned up. I bisected it -down to the commit introducing the new 'asm goto'-based atomics, -and found this quirk was later applied to those. - -Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the -known 'asm goto' bug) I am still getting some kind of -miscompilation. If I enable the asm_volatile_goto quirk for my -compiler, KVM guests are destroyed correctly and the memory is -cleaned up. - -So make the quirk unconditional for now, until bug is found -and fixed. - -Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Steven Noonan <steven@uplinklabs.net> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Steven Rostedt <rostedt@goodmis.org> -Cc: Jakub Jelinek <jakub@redhat.com> -Cc: Richard Henderson <rth@twiddle.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: <stable@vger.kernel.org> -Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net -Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -Signed-off-by: Ingo Molnar <mingo@kernel.org> ---- -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -index ded4299..2507fd2 100644 ---- a/include/linux/compiler-gcc4.h -+++ b/include/linux/compiler-gcc4.h -@@ -75,11 +75,7 @@ - * - * (asm goto is automatically volatile - the naming reflects this.) - */ --#if GCC_VERSION <= 40801 --# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) --#else --# define asm_volatile_goto(x...) do { asm goto(x); } while (0) --#endif -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - - #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP - #if GCC_VERSION >= 40400 --- -cgit v0.9.2 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 77251bc07..cd2b63bc8 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $ +# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.13 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -38,11 +38,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch' '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch' '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch' - '0001-quirk-asm_volatile_goto.patch' 'i8042-fix-aliases.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '3659d30b1d06dd5b7874ae04c946863b' + '6e59a1e4b891ca5fa8b03d488fa64e04' 'b6a3a3f9cac1be38384241ad58d45d46' '3740951ae165b89a2139d45ae7d82173' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -59,9 +58,8 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' 'a724515b350b29c53f20e631c6cf9a14' '1ae4ec847f41fa1b6d488f956e94c893' 'e6fa278c092ad83780e2dd0568e24ca6' - '6baa312bc166681f48e972824f3f6649' '93dbf73af819b77f03453a9c6de2bb47' - 'ac92b702b8497d2be14f96e077a7f48f') + '5fcb6203b54aaf7dcbdf6e2c6f159b14') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -117,9 +115,6 @@ prepare() { # Fix i8042 aliases patch -p1 -i "${srcdir}/i8042-fix-aliases.patch" - # Fix compile issues - # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859 - patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch" if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile diff --git a/libre/ponysay-libre/PKGBUILD b/libre/ponysay-libre/PKGBUILD new file mode 100644 index 000000000..703a562d6 --- /dev/null +++ b/libre/ponysay-libre/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Erkin Batu Altunbaş <erkinbatu@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> +# Contributor (Parabola): Márcio Silva <coadde@parabola.nu> + +_pkgname=ponysay +pkgname=ponysay-libre +pkgver=3.0.1 +pkgrel=1 +pkgdesc="cowsay reimplemention for ponies, without nonfree pony graphics" +url="http://erkin.github.com/ponysay/" +arch=('any') +license=('GPL3') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +depends=('python' 'bash') +makedepends=('git') +mksource=("ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/tarball/$pkgver") +source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz") +mkmd5sums=('3fac23eb1a3a9d0640ecebd1919b4390') +md5sums=('21451fee1a773eb76572cc1cafad8422') + +mksource() { + cd "$srcdir/erkin-ponysay-"* + + # Generate a nonfree pony graphics list to replace it with empty files + # NOTE: empty files are necessary for the building checking only, --freedom=strict will not include them for the packaging + grep -rIl 'FREE: sharable' | cat > nonfree-pony-graphics-list.txt + grep -rIl 'FREE: no' | cat >> nonfree-pony-graphics-list.txt + + # Remove nonfree pony graphics + rm -v $(grep -rIl 'FREE: sharable') + rm -v $(grep -rIl 'FREE: no') + + # Generate empty files + for x in $(cat nonfree-pony-graphics-list.txt); do + touch $x + done + + # Remove list + rm -v nonfree-pony-graphics-list.txt +} + +package() { + cd "$srcdir/erkin-ponysay-"* + + python3 setup.py --prefix=/usr --dest-dir=$pkgdir --freedom=strict --everything --with-pdf=/usr/share/doc/ponysay --without-pdf-compression install +} diff --git a/libre/python-reportlab-libre/ChangeLog b/libre/python-reportlab-libre/ChangeLog new file mode 100644 index 000000000..85b5db51f --- /dev/null +++ b/libre/python-reportlab-libre/ChangeLog @@ -0,0 +1,18 @@ + +2009-02-17 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 2.3 + +2008-11-03 Giovanni Scafora <giovanni@archlinux.org> + + * Rebuilt against python 2.6 + +2008-09-14 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for x86_64: 2.2 + +2008-09-13 Douglas Soares de Andrade <douglas@archlinux.org> + + * Adding ChangeLog + * Updating for i686: 2.2 + diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD new file mode 100644 index 000000000..401d61c9f --- /dev/null +++ b/libre/python-reportlab-libre/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $ +# Maintainer: +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: William Rea <sillywilly@gmail.com> +# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor: borgo <nomail> +# Contributor (Parabola): André Silva <emulatorman@parabola.nu> + +pkgbase=python-reportlab-libre +pkgname=(python2-reportlab-libre python-reportlab-libre) +_origname=reportlab +pkgver=3.0 +pkgrel=1 +pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" +arch=('i686' 'x86_64') +url="http://www.reportlab.org/rl_toolkit.html" +depends=('freetype2') +checkdepends=('python' 'python2') +license=('custom') +source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz + free-fonts.patch) +md5sums=('a4fd40abcfb604aa3bd907181133c071' + 'eb3ac47734efb05b939fb88026aff8ed') + +prepare() { + cd $srcdir + cp -rf ${_origname}-$pkgver "${_origname}2-$pkgver" + + _reportlab_source=("${_origname}-$pkgver" "${_origname}2-$pkgver") + + for x in ${_reportlab_source[@]}; do + cd $srcdir/$x + + # remove nonfree Adobe T1 fonts support + patch -p1 -i $srcdir/free-fonts.patch + + # Parabola contains those fonts from the ttf-bitstream-vera package + rm -fv src/reportlab/fonts/{bitstream-vera-license.txt,Vera*} + done +} + +package_python2-reportlab-libre() { + conflicts+=('python2-reportlab' 'python-reportlab<=2.5-2') + replaces+=('python2-reportlab' 'python-reportlab<=2.5-2') + provides=("python2-reportlab=$pkgver") + depends=('python2') + cd "$srcdir/${_origname}2-$pkgver" + python2 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt +} + +package_python-reportlab-libre() { + conflicts+=('python-reportlab' 'python-reportlab-libre<=2.5-2') + replaces+=('python-reportlab' 'python-reportlab-libre<=2.5-2') + provides=("python-reportlab=$pkgver") + depends=('python3') + cd "$srcdir/${_origname}-$pkgver" + python3 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt +} + + +check() { + cd ${srcdir}/${_origname}-${pkgver} + python2 setup.py tests + python setup.py tests +} diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch new file mode 100644 index 000000000..d88b3b31b --- /dev/null +++ b/libre/python-reportlab-libre/free-fonts.patch @@ -0,0 +1,61 @@ +diff -Nur reportlab-3.0.orig/setup.py reportlab-3.0/setup.py +--- reportlab-3.0.orig/setup.py 2014-02-14 12:22:37.000000000 -0200 ++++ reportlab-3.0/setup.py 2014-02-27 22:46:48.998702565 -0200 +@@ -254,11 +254,6 @@ + infoline('not downloading T1 font curve files') + return + try: +- infoline("Downloading standard T1 font curves") +- +- remotehandle = ureq.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") +- zipdata = io.BytesIO(remotehandle.read()) +- remotehandle.close() + archive = zipfile.ZipFile(zipdata) + dst = pjoin(rl_dir, 'fonts') + +@@ -271,7 +266,6 @@ + except: + xitmsg = "Failed to download standard T1 font curves" + reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] +- infoline(xitmsg) + + def main(): + #test to see if we've a special command +diff -Nur reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py reportlab-3.0/src/reportlab/pdfbase/_fontdata.py +--- reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py 2014-02-14 12:22:37.000000000 -0200 ++++ reportlab-3.0/src/reportlab/pdfbase/_fontdata.py 2014-02-27 22:26:55.438002204 -0200 +@@ -72,20 +72,20 @@ + } + if sys.platform in ('linux2',): + _font2fnrMapLinux2 ={ +- 'symbol': 'Symbol', +- 'zapfdingbats': 'ZapfDingbats', +- 'helvetica': 'Arial', +- 'helvetica-bold': 'Arial-Bold', +- 'helvetica-boldoblique': 'Arial-BoldItalic', +- 'helvetica-oblique': 'Arial-Italic', +- 'times-bold': 'TimesNewRoman-Bold', +- 'times-bolditalic':'TimesNewRoman-BoldItalic', +- 'times-italic': 'TimesNewRoman-Italic', +- 'times-roman': 'TimesNewRoman', +- 'courier-bold': 'Courier-Bold', +- 'courier-boldoblique': 'Courier-BoldOblique', +- 'courier': 'Courier', +- 'courier-oblique': 'Courier-Oblique', ++ 'symbol': 's050000l.pfb', ++ 'zapfdingbats': 'd050000l.pfb', ++ 'helvetica': 'n019003l.pfb', ++ 'helvetica-bold': 'n019004l.pfb', ++ 'helvetica-boldoblique': 'n019024l.pfb', ++ 'helvetica-oblique': 'n019023l.pfb', ++ 'times-bold': 'n021004l.pfb', ++ 'times-bolditalic':'n021024l.pfb', ++ 'times-italic': 'n021023l.pfb', ++ 'times-roman': 'n021003l.pfb', ++ 'courier-bold': 'n022004l.pfb', ++ 'courier-boldoblique': 'n022024l.pfb', ++ 'courier': 'n022003l.pfb', ++ 'courier-oblique': 'n022023l.pfb', + } + _font2fnrMap = _font2fnrMapLinux2 + for k, v in _font2fnrMap.items(): diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD deleted file mode 100644 index 0f608f7a0..000000000 --- a/libre/python2-reportlab-libre/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor: borgo <nomail> -# Contributor (Parabola): André Silva <emulatorman@parabola.nu> - -pkgbase=python-reportlab-libre -pkgname=python2-reportlab-libre -_origname=reportlab -pkgver=2.7 -pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" -arch=('i686' 'x86_64') -url="http://www.reportlab.org/rl_toolkit.html" -depends=('python2' 'freetype2') -conflicts=('python-reportlab<=2.5-2' 'python2-reportlab') -replaces=('python-reportlab<=2.5-2' 'python2-reportlab') -provides=("python2-reportlab=$pkgver") -license=('custom') -source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz - free-fonts.patch) -md5sums=('78300e6fe8a0d020fc16734a3de80cc4' - '1588b88851711cc6c868db4c7d4f4dea') - -build() { - cd $srcdir/${_origname}-$pkgver - - # remove nonfree Adobe T1 fonts support - patch -p1 -i $srcdir/free-fonts.patch - - # Parabola contains those fonts from the ttf-bitstream-vera package - rm -f src/reportlab/fonts/{bitstream-vera-license.txt,Vera*} - - # python2 fix - for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ - src/reportlab/pdfgen/pycanvas.py; do - sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file - done -} - -package_python2-reportlab-libre() { - cd $srcdir/${_origname}-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 - install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} - -check() { - cd ${srcdir}/${_origname}-${pkgver} -# python2 setup.py tests -} diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch deleted file mode 100644 index b2683931b..000000000 --- a/libre/python2-reportlab-libre/free-fonts.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py ---- reportlab-2.6.orig/setup.py 2012-09-27 13:14:06.000000000 -0300 -+++ reportlab-2.6/setup.py 2012-10-18 14:34:16.750336101 -0200 -@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - infoline("Standard T1 font curves already downloaded") - return - try: -- infoline("Downloading standard T1 font curves") -+ #infoline("Downloading standard T1 font curves") - -- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") -- zipdata = StringIO.StringIO(remotehandle.read()) -- remotehandle.close() -+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip") -+ #zipdata = StringIO.StringIO(remotehandle.read()) -+ #remotehandle.close() - archive = zipfile.ZipFile(zipdata) - dst = pjoin(rl_dir, 'fonts') - -@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil - except: - xitmsg = "Failed to download standard T1 font curves" - reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))] -- infoline(xitmsg) -+ #infoline(xitmsg) - - def main(): - #test to see if we've a special command -diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py ---- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py 2012-09-27 11:39:39.000000000 -0300 -+++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py 2012-10-18 14:36:08.018365073 -0200 -@@ -72,20 +72,20 @@ _font2fnrMapWin32 = { - } - if sys.platform in ('linux2',): - _font2fnrMapLinux2 ={ -- 'symbol': 'Symbol', -- 'zapfdingbats': 'ZapfDingbats', -- 'helvetica': 'Arial', -- 'helvetica-bold': 'Arial-Bold', -- 'helvetica-boldoblique': 'Arial-BoldItalic', -- 'helvetica-oblique': 'Arial-Italic', -- 'times-bold': 'TimesNewRoman-Bold', -- 'times-bolditalic':'TimesNewRoman-BoldItalic', -- 'times-italic': 'TimesNewRoman-Italic', -- 'times-roman': 'TimesNewRoman', -- 'courier-bold': 'Courier-Bold', -- 'courier-boldoblique': 'Courier-BoldOblique', -- 'courier': 'Courier', -- 'courier-oblique': 'Courier-Oblique', -+ 'symbol': 's050000l.pfb', -+ 'zapfdingbats': 'd050000l.pfb', -+ 'helvetica': 'n019003l.pfb', -+ 'helvetica-bold': 'n019004l.pfb', -+ 'helvetica-boldoblique': 'n019024l.pfb', -+ 'helvetica-oblique': 'n019023l.pfb', -+ 'times-bold': 'n021004l.pfb', -+ 'times-bolditalic':'n021024l.pfb', -+ 'times-italic': 'n021023l.pfb', -+ 'times-roman': 'n021003l.pfb', -+ 'courier-bold': 'n022004l.pfb', -+ 'courier-boldoblique': 'n022024l.pfb', -+ 'courier': 'n022003l.pfb', -+ 'courier-oblique': 'n022023l.pfb', - } - _font2fnrMap = _font2fnrMapLinux2 - for k, v in _font2fnrMap.items(): -diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py ---- reportlab-2.6.orig/src/reportlab/rl_config.py 2012-09-27 11:39:39.000000000 -0300 -+++ reportlab-2.6/src/reportlab/rl_config.py 2012-10-18 16:05:12.683766581 -0200 -@@ -49,25 +49,7 @@ ttfAsciiReadable= 1 - - # places to look for T1Font information - T1SearchPath = ( -- 'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', -- 'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6 -- 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5 -- 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4 -- '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac? -- '/usr/lib/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4 -- '/usr/local/Acrobat9/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat8/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat7/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5? -- '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4 -+ '/usr/share/fonts/Type1', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts', #special -@@ -76,44 +58,17 @@ T1SearchPath = ( - - # places to look for TT Font information - TTFSearchPath = ( -- 'c:/winnt/fonts', -- 'c:/windows/fonts', -- '/usr/lib/X11/fonts/TrueType/', -- '/usr/share/fonts/truetype', -+ '/usr/share/fonts/TTF', - '%(REPORTLAB_DIR)s/fonts', #special - '%(REPORTLAB_DIR)s/../fonts', #special - '%(REPORTLAB_DIR)s/../../fonts',#special - '%(HOME)s/fonts', #special -- #mac os X - from -- #http://developer.apple.com/technotes/tn/tn2024.html -- '~/Library/Fonts', -- '/Library/Fonts', -- '/Network/Library/Fonts', -- '/System/Library/Fonts', -- - ) - - # places to look for CMap files - should ideally merge with above - CMapSearchPath = ( -- '/usr/lib/Acrobat9/Resource/CMap', -- '/usr/lib/Acrobat8/Resource/CMap', -- '/usr/lib/Acrobat7/Resource/CMap', -- '/usr/lib/Acrobat6/Resource/CMap', -- '/usr/lib/Acrobat5/Resource/CMap', -- '/usr/lib/Acrobat4/Resource/CMap', -- '/usr/local/Acrobat9/Resource/CMap', -- '/usr/local/Acrobat8/Resource/CMap', -- '/usr/local/Acrobat7/Resource/CMap', -- '/usr/local/Acrobat6/Resource/CMap', -- '/usr/local/Acrobat5/Resource/CMap', -- '/usr/local/Acrobat4/Resource/CMap', -- 'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap', -- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap', -+ '/usr/share/ghostscript/9.04/Resource/CMap', -+ '/usr/share/ghostscript/9.06/Resource/CMap', - '%(REPORTLAB_DIR)s/fonts/CMap', #special - '%(REPORTLAB_DIR)s/../fonts/CMap', #special - '%(REPORTLAB_DIR)s/../../fonts/CMap', #special diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index f7adb5b80..dcd34bcd1 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $ +# $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: orelien <aurelien.foret@wanadoo.fr> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,12 +6,12 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=4 +pkgrel=5 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') -depends=('ppp>=2.4.5' 'sh' 'net-tools') +depends=('ppp=2.4.6' 'sh' 'net-tools') backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) options=('!makeflags') diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index aba64f230..0e7498c02 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103245 2013-12-31 11:33:47Z stativ $ +# $Id: PKGBUILD 106378 2014-03-01 17:19:07Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,12 +7,15 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.5 +pkgver=2.1.0 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=29024" license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib') makedepends=('automoc4' 'cmake') optdepends=('cdrkit: cdda2wav backend' @@ -31,12 +34,9 @@ optdepends=('cdrkit: cdda2wav backend' 'vorbis-tools: vorbis tools backend' 'wavpack: wavpack backend' 'sox: sox plugin (change sample rate, various effects)') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('42f7dd8fe5f4d8d18d41c2b1302322ee') +md5sums=('763dd81c14948ca6ffa8637f6bda0e5f') build() { cd "$srcdir"/$_pkgname-$pkgver diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index d7d01b498..c1ea8c449 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103873 2014-01-13 00:22:03Z kkeen $ +# $Id: PKGBUILD 106288 2014-02-26 16:09:20Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.4.0 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') url="http://www.spectrwm.org" @@ -21,12 +21,10 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh \ - swmhack_path.patch \ spectrwm-no-preload) -md5sums=('23e32c1e292f2fc94ed88195ffe60023' +md5sums=('22355256693393779b2d366d312c4577' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' - '8914dc2bef96e3587fc9317a25c1cbe8' '974d109ce0af39cc73936d5efd682480') build() { @@ -42,9 +40,6 @@ build() { # see spectrwm FS#403 sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c - # FS#37998, remove on 2.4.1 - patch -p1 -i "$srcdir/swmhack_path.patch" - cd linux make PREFIX="/usr" } diff --git a/libre/spectrwm-libre/swmhack_path.patch b/libre/spectrwm-libre/swmhack_path.patch deleted file mode 100644 index a4f1c3cf0..000000000 --- a/libre/spectrwm-libre/swmhack_path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/linux/Makefile b/linux/Makefile -index 73c3d37..f48a32f 100644 ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -1,16 +1,16 @@ --CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g --CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" --LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -- - PREFIX?= /usr/local - BINDIR?= $(PREFIX)/bin - LIBDIR?= $(PREFIX)/lib - MANDIR?= $(PREFIX)/share/man - --CC?= cc -- - LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) - -+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g -+CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" -+LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -+ -+CC?= cc -+ - BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) - ifneq ("${BUILDVERSION}", "") - CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 824c7da2b..2e40800bd 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $ +# $Id: PKGBUILD 206573 2014-03-01 18:15:00Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.660 -pkgrel=1.1 +pkgver=1.670 +pkgrel=1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') @@ -83,17 +83,17 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi 'etc/webmin/pserver/config' \ 'etc/webmin/dnsadmin/config' ) install=webmin.install -source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz - ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 - ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.service) +source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz + ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 + ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 + webmin.service) options=(!strip) package() { # NOTE: USE --asroot build option to avoid fakeroot error! cd "$srcdir"/$pkgname-$pkgver # add patches from webmin.com - #for i in ../*.wbm + #for i in ../*.wbm #do tar xvf $i #done #for i in ../*.wbt @@ -103,13 +103,13 @@ package() { rm -f mount/freebsd-mounts* rm -f mount/openbsd-mounts* rm -f mount/macos-mounts* - + # remove modules we do not support rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin} - + #remove config files from other distros rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') - + # remove caldera theme rm -rf caldera @@ -124,27 +124,27 @@ package() { rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} # remove modules add because we don't want files installed without pacman control - rm -f webmin/{install_mod.cgi,delete_mod.cgi} + rm -f webmin/{install_mod.cgi,delete_mod.cgi} # setting perl path (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - - + # create dirs mkdir -p "$pkgdir"/opt/webmin mkdir -p "$pkgdir"/var/log/webmin mkdir -p "$pkgdir"/etc/webmin - + # install pam stuff install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin - + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! rm os_list.txt echo 'Parabola GNU/linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt - + # Add rc.conf support to boot and shutdown menu and lock editing of this module cd init/ sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') - sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/* sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/* sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl @@ -184,18 +184,18 @@ package() { atbootyn=n tempdir="$pkgdir"/tmp export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn - + # Fix setup.sh sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh "$pkgdir"/opt/webmin/setup.sh - + # Fixup the config files to use their real locations sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf - find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; - + find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; + # make it only accessible by localhost echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf - + # install pacman menu cd "$srcdir"/webmin-pacman/config cp -rfp * "$pkgdir"/etc/webmin/pacman @@ -210,7 +210,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('56a685a665b864470eeb7ce6b97961d8' +md5sums=('db2edf10ad1eb0cc8d80849a61dafd3a' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'c86518037449e0fc0c60fc24537ea038' 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index a565c8421..cccfb7941 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $ +# $Id: PKGBUILD 106277 2014-02-26 11:07:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> # Contributor: Zeqadious <zeqadious.at.gmail.dot.com> # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _prefix=/usr @@ -11,8 +12,8 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=8.1 -pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" +pkgrel=10 +pkgdesc="A software media player and entertainment hub for digital media, without unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') @@ -28,21 +29,29 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'lirc: remote controller support' 'udisks: automount external drives' 'upower: used to trigger power management functionality' - 'libarchive: access compressed files without unpacking them' 'xorg-xinit: autostart xbmc') install="${_pkgname}.install" replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" +mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" "xbmc.service" "polkit.rules" "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") -md5sums=('7ae385ebf8e5cfcb917393235e6efbdb' - '8312d6d4ac5d7c3d9eed40ab08a17d3b' +mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') +md5sums=('7c71af50af55b097e4365a58b70754e8' + 'a32b879d010a0060a8057bb8cb2f4c9e' '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') +mksource() { + cd "${srcdir}/xbmc-$pkgver-$_codename" + + # remove unrar files from the source + rm -rv lib/UnrarXLib +} + prepare() { cd "${srcdir}/xbmc-$pkgver-$_codename" @@ -93,7 +102,8 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ - --enable-external-ffmpeg + --enable-external-ffmpeg \ + --disable-non-free # Now (finally) build make } diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 32626f28f..8076fe2d3 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -3,7 +3,8 @@ post_install() { [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications 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 + usermod -a -G xbmc,audio,video,network,optical xbmc + mkdir -p var/lib/xbmc chown -R xbmc:xbmc var/lib/xbmc } diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index b6430e255..4353defa2 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -5,8 +5,9 @@ After = remote-fs.target [Service] User = xbmc Group = xbmc +PAMName=login Type = simple -ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp Restart = on-abort [Install] |