diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 18:11:29 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 18:11:29 -0500 |
commit | 9fd86352e56ebf96efd098eee999b3c6f7221bc6 (patch) | |
tree | 78c47aae367eb312030f523760f695fe851a67ec | |
parent | d067e3fcf48ce625c87aaa172cb9ec99175ba61a (diff) | |
parent | 50f8823e2e69bc597155e47e70fe40ca09e68b8d (diff) | |
download | abslibre-9fd86352e56ebf96efd098eee999b3c6f7221bc6.tar.gz abslibre-9fd86352e56ebf96efd098eee999b3c6f7221bc6.tar.bz2 abslibre-9fd86352e56ebf96efd098eee999b3c6f7221bc6.zip |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
-rw-r--r-- | libre/antlr2/PKGBUILD | 11 | ||||
-rw-r--r-- | libre/audex-libre/PKGBUILD | 27 | ||||
-rw-r--r-- | libre/audex-libre/gcc47.patch | 13 | ||||
-rw-r--r-- | libre/icecat-noscript/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/iceweasel-noscript/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/xbmc-libre/PKGBUILD | 16 | ||||
-rw-r--r-- | libre/xbmc-libre/xbmc.service | 4 | ||||
-rw-r--r-- | ~drtan/parabola-gnome/PKGBUILD | 15 | ||||
-rw-r--r-- | ~drtan/parabola-gnome/parabola-gnome.install | 22 | ||||
-rw-r--r-- | ~drtan/parabola-gnome/parabola.xml | 20 |
10 files changed, 47 insertions, 93 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/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD index 2c4ef80aa..890df887f 100644 --- a/libre/audex-libre/PKGBUILD +++ b/libre/audex-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 106445 2014-03-03 14:51:50Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: mightyjaym <jmambrosino@gmail.com> @@ -7,43 +7,38 @@ _pkgname=audex pkgname=audex-libre -pkgver=0.77b1 +pkgver=0.78 pkgrel=1 -pkgdesc="A CDDA extraction tool with a ftp upload function for KDE (without nonfree faac recommendation)" +pkgdesc="A CDDA extraction tool with a ftp upload function for KDE, without nonfree faac recommendation" arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php?content=77125" license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') makedepends=('cmake' 'automoc4') optdepends=('vorbis-tools: OGG encoder' 'flac: FLAC encoder' 'lame: MP3 encoder') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver install=${_pkgname}.install -#source=("ftp://ftp.archlinux.org/other/community/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" -source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz" - 'gcc47.patch') -md5sums=('1f3df64b60b15315e958e3e3b151fe92' - '64107bcf90e22910e57804be774822dd') +source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz") +md5sums=('e424309ab085de40043f841f2fa230c6') build() { cd ${_pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/gcc47.patch - cd .. - mkdir build cd build - cmake ../${_pkgname}-${pkgver} \ + cmake ../ \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${srcdir}/build + cd ${_pkgname}-${pkgver}/build + make DESTDIR=${pkgdir} install } diff --git a/libre/audex-libre/gcc47.patch b/libre/audex-libre/gcc47.patch deleted file mode 100644 index 3d0ccf024..000000000 --- a/libre/audex-libre/gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- audex-0.74b1.orig/utils/hashlist.cpp -+++ audex-0.74b1/utils/hashlist.cpp -@@ -15,7 +15,8 @@ - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -- -+ -+#include <unistd.h> - #include "hashlist.h" - - Hashlist::Hashlist() { - diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 643db648f..084e9a5a3 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105656 2014-02-13 09:26:07Z spupykin $ +# $Id: PKGBUILD 106436 2014-03-03 06:35:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.14 +pkgver=2.6.8.16 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=('f0ecd6bd7c7331d77c91df55bdb3d7da') +md5sums=('03c72e88e22a392174a395cb3563f0fa') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 3250bad42..329546c29 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105656 2014-02-13 09:26:07Z spupykin $ +# $Id: PKGBUILD 106436 2014-03-03 06:35:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.14 +pkgver=2.6.8.16 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=('f0ecd6bd7c7331d77c91df55bdb3d7da') +md5sums=('03c72e88e22a392174a395cb3563f0fa') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index cccfb7941..5a2df28db 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106277 2014-02-26 11:07:14Z spupykin $ +# $Id: PKGBUILD 106505 2014-03-05 09:28:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -12,11 +12,14 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=10 +pkgrel=11 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') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' @@ -31,9 +34,6 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'upower: used to trigger power management functionality' 'xorg-xinit: autostart xbmc') install="${_pkgname}.install" -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" "xbmc.service" @@ -41,7 +41,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver} "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') md5sums=('7c71af50af55b097e4365a58b70754e8' - 'a32b879d010a0060a8057bb8cb2f4c9e' + 'b643ab67e4675c6aa88af1857f35baf2' '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') @@ -131,7 +131,7 @@ package() { done install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service - install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules - chmod 0700 $pkgdir/usr/share/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/xbmc.service b/libre/xbmc-libre/xbmc.service index 4353defa2..d161a21a8 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -1,13 +1,15 @@ [Unit] Description = Starts instance of XBMC using xinit After = remote-fs.target +Conflicts=getty@tty7.service [Service] User = xbmc Group = xbmc PAMName=login Type = simple -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp +TTYPath=/dev/tty7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 Restart = on-abort [Install] diff --git a/~drtan/parabola-gnome/PKGBUILD b/~drtan/parabola-gnome/PKGBUILD index e0762987b..c179800cc 100644 --- a/~drtan/parabola-gnome/PKGBUILD +++ b/~drtan/parabola-gnome/PKGBUILD @@ -2,18 +2,23 @@ pkgname=parabola-gnome pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc="The GNOME configuration for Parabola GNU/Linux-libre" arch=('any') url="https://parabolagnulinux.org" license=('GPL3') install=$pkgname.install -depends=('dbus-glib' 'parabola-artwork>=1.0-2') -source=('parabola.xml') -sha256sums=('27f1580c8751c272eb24bc1426cb3a9395c3fa072c89cbf28fd89061fe15a82f') +depends=('dbus-glib' 'parabola-artwork>=1.0-4') +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz") +sha256sums=('979ab611fdf9a9cddf97c7f6c646bf39df8765787b077ac0b836e75a67897a08') package() { + cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel} install -d "${pkgdir}/usr/share/gnome-background-properties" - install -m644 parabola.xml "${pkgdir}/usr/share/gnome-background-properties/" + install -m644 gnome-background-properties/01-parabola.xml "${pkgdir}/usr/share/gnome-background-properties/" + install -d "${pkgdir}/etc/dconf/db/local.d" + install -m644 dconf/db/local.d/* "${pkgdir}/etc/dconf/db/local.d/" + install -d "${pkgdir}/etc/dconf/profile" + install -m644 dconf/profile/* "${pkgdir}/etc/dconf/profile/" } diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/~drtan/parabola-gnome/parabola-gnome.install index 8d87c609a..8fce17b2e 100644 --- a/~drtan/parabola-gnome/parabola-gnome.install +++ b/~drtan/parabola-gnome/parabola-gnome.install @@ -1,11 +1,5 @@ post_install() { - # Change default wallpaper - dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/parabola/artwork/stripes.png - dbus-launch gsettings set org.gnome.desktop.background picture-options zoom - - # Change default lock screen wallpaper. - dbus-launch gsettings set org.gnome.desktop.screensaver picture-uri file:///usr/share/parabola/artwork/stripes-desaturated.png - dbus-launch gsettings set org.gnome.desktop.screensaver picture-options zoom + dconf update } post_upgrade() { @@ -13,17 +7,5 @@ post_upgrade() { } post_remove() { - # Reset default wallpaper to default for GNOME (if the user didn't choose some other). - if [ $(dbus-launch gsettings get org.gnome.desktop.background picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ] - then - dbus-launch gsettings reset org.gnome.desktop.background picture-uri - dbus-launch gsettings reset org.gnome.desktop.background picture-options - fi - - # Reset default lock screen wallpaper to default for GNOME (if the user didn't choose some other). - if [ $(dbus-launch gsettings get org.gnome.desktop.screensaver picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ] - then - dbus-launch gsettings reset org.gnome.desktop.screensaver picture-uri - dbus-launch gsettings reset org.gnome.desktop.screensaver picture-options - fi + post_install $1 } diff --git a/~drtan/parabola-gnome/parabola.xml b/~drtan/parabola-gnome/parabola.xml deleted file mode 100644 index 625bf241c..000000000 --- a/~drtan/parabola-gnome/parabola.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> -<wallpapers> - <wallpaper deleted="false"> - <name>Stripes</name> - <filename>/usr/share/parabola/artwork/stripes.png</filename> - <options>zoom</options> - <pcolor>#ffffff</pcolor> - <scolor>#ffffff</scolor> - <shade_type>solid</shade_type> - </wallpaper> - <wallpaper deleted="false"> - <name>Stripes Desaturated</name> - <filename>/usr/share/parabola/artwork/stripes-desaturated.png</filename> - <options>zoom</options> - <pcolor>#ffffff</pcolor> - <scolor>#ffffff</scolor> - <shade_type>solid</shade_type> - </wallpaper> -</wallpapers> |