diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-04-26 10:21:36 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-04-26 10:21:36 -0300 |
commit | c1cd2590bc25ba239285ac84c27196dc0da452b1 (patch) | |
tree | 63d98a0418d7cd6e3329ec483666a521967cf83d | |
parent | 8b62eb163aaa29bfe1668e5169271a04b0716c7f (diff) | |
parent | 889f174a76aff4d50f029273bd0aadda83880fb3 (diff) | |
download | abslibre-c1cd2590bc25ba239285ac84c27196dc0da452b1.tar.gz abslibre-c1cd2590bc25ba239285ac84c27196dc0da452b1.tar.bz2 abslibre-c1cd2590bc25ba239285ac84c27196dc0da452b1.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r-- | libre/bumblebee-libre/PKGBUILD | 11 | ||||
-rw-r--r-- | pcr/ruby-headers/PKGBUILD | 15 | ||||
-rw-r--r-- | pcr/ruby-mustache/PKGBUILD (renamed from ~fauno/ruby-mustache/PKGBUILD) | 5 | ||||
-rw-r--r-- | pcr/sigil/PKGBUILD | 48 | ||||
-rwxr-xr-x | pcr/sigil/sigil.desktop | 12 | ||||
-rw-r--r-- | pcr/sigil/sigil.install | 12 | ||||
-rw-r--r-- | pcr/transmission-remote-cli/PKGBUILD (renamed from ~fauno/transmission-remote-cli/PKGBUILD) | 0 | ||||
-rw-r--r-- | pcr/transmission-remote-cli/python2.patch (renamed from ~fauno/transmission-remote-cli/python2.patch) | 0 |
8 files changed, 87 insertions, 16 deletions
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index 8805ff9d1..d07cb1c64 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -3,8 +3,8 @@ _pkgname=bumblebee pkgname=bumblebee-libre -pkgver=3.1 -pkgrel=6.2 +pkgver=3.2 +pkgrel=1 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -27,10 +27,10 @@ backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau') source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz" 'libre.patch') -md5sums=('de515ef51b1e0714c2f1b2a95f83e77e' +md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74' 'f8b6044310039911236f53a625c611a6') -build() { +prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" # Remove nonfree references to nonfree nvidia driver and unnecessaries files @@ -40,6 +40,9 @@ build() { rm -rv "scripts/bumblebee-bugreport.in" patch -Np1 -i "${srcdir}/libre.patch" +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ CONF_DRIVER=nouveau \ --prefix=/usr \ diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD index 855c7ff38..074205e79 100644 --- a/pcr/ruby-headers/PKGBUILD +++ b/pcr/ruby-headers/PKGBUILD @@ -3,29 +3,24 @@ pkgname=ruby-headers _pkgname=ruby -pkgver=1.9.3_p385 -_pkgver=1.9.3-p385 +pkgver=2.0.0_p0 +_pkgver=2.0.0-p0 pkgrel=1 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') url="http://www.ruby-lang.org/en/" license=('GPL2' 'custom:Ruby') depends=("ruby=$pkgver") -source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2") - -build() { - /bin/true -} +source=("http://ftp.ruby-lang.org/pub/ruby/2.0/$_pkgname-$_pkgver.tar.bz2") package() { cd "$srcdir/$_pkgname-$_pkgver" - # Just to make sure, since currently we have /usr/include/ruby-1.9.1 for ruby 1.9.2 - _hdrdir=`ruby -e "require 'rbconfig'; puts Config::CONFIG['rubyhdrdir']"` + _hdrdir=`ruby -e "require 'rbconfig'; puts RbConfig::CONFIG['rubyhdrdir']"` install -d "$pkgdir$_hdrdir/$_pkgname-$_pkgver" install -m644 *.{h,inc} "$pkgdir$_hdrdir/$_pkgname-$_pkgver" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c') +md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a') diff --git a/~fauno/ruby-mustache/PKGBUILD b/pcr/ruby-mustache/PKGBUILD index 8c8d924c1..ddb5215d3 100644 --- a/~fauno/ruby-mustache/PKGBUILD +++ b/pcr/ruby-mustache/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: David Campbell <davekong@archlinux.us> pkgname=ruby-mustache pkgver=0.99.4 -pkgrel=2 +pkgrel=3 pkgdesc="A framework-agnostic way to render logic-free views." arch=('any') url="http://github.com/defunkt/mustache" license=(MIT) -depends=('ruby') +depends=('ruby>=2') makedepends=('rubygems') source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem" "https://raw.github.com/defunkt/mustache/master/LICENSE") @@ -18,6 +18,7 @@ build() { cd $srcdir local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" gem install \ + --no-user-install \ --ignore-dependencies \ -i "$pkgdir$_gemdir" mustache-$pkgver.gem \ -n "$pkgdir/usr/bin" diff --git a/pcr/sigil/PKGBUILD b/pcr/sigil/PKGBUILD new file mode 100644 index 000000000..0d5802ac1 --- /dev/null +++ b/pcr/sigil/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 59836 2011-11-30 22:56:23Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> +# Contributor: Jorge Araya Navarro <jorgean@lavabit.com> + +pkgname=sigil +pkgver=0.7.2 +pkgrel=1 +pkgdesc="A WYSIWYG ebook editor" +arch=('i686' 'x86_64') +url="http://code.google.com/p/sigil/" +license=('GPL3') +depends=('qt5-base' 'qt5-svg' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-tools') +makedepends=('cmake') +provides=('sigil') +conflicts=('sigil') +install=sigil.install +source=("http://sigil.googlecode.com/files/Sigil-0.7.2-Code.zip" + "sigil.desktop") + +build() { + cd ${srcdir} + mkdir build + cd build + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON .. + + make +} + +package() { + cd "${srcdir}"/build + make install DESTDIR="${pkgdir}" + + install -d -m 0755 "${pkgdir}"/usr/share/applications + install -m 0644 "${srcdir}"/sigil.desktop "${pkgdir}"/usr/share/applications + + for _pic in 16 32 48 128 256; do + install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \ + "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/sigil.png + done +} +sha256sums=('8a6f5fd7c59fd8524ce0f48e7d13d13bad137053c9071fe2e1653ea55d5ed940' + '92a1014794dbf81fa997449338ded9a0e84593e3552020eb9269039b916bea36') diff --git a/pcr/sigil/sigil.desktop b/pcr/sigil/sigil.desktop new file mode 100755 index 000000000..cdb4ce1b2 --- /dev/null +++ b/pcr/sigil/sigil.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=Sigil +Comment=WYSIWYG ebook editor +TryExec=sigil +Exec=sigil %F +Icon=sigil +Terminal=false +StartupNotify=false +Categories=Application;Office; +MimeType=application/epub+zip; diff --git a/pcr/sigil/sigil.install b/pcr/sigil/sigil.install new file mode 100644 index 000000000..ec506fa93 --- /dev/null +++ b/pcr/sigil/sigil.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD index 5e3699bce..5e3699bce 100644 --- a/~fauno/transmission-remote-cli/PKGBUILD +++ b/pcr/transmission-remote-cli/PKGBUILD diff --git a/~fauno/transmission-remote-cli/python2.patch b/pcr/transmission-remote-cli/python2.patch index 256b676f0..256b676f0 100644 --- a/~fauno/transmission-remote-cli/python2.patch +++ b/pcr/transmission-remote-cli/python2.patch |