summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/README1
-rw-r--r--gnu/gnun/PKGBUILD31
-rw-r--r--libre/file-roller-libre/PKGBUILD5
-rw-r--r--libre/file-roller-libre/rePKGBUILD2
-rw-r--r--libre/mplayer-libre/PKGBUILD16
-rw-r--r--libre/thunderbird-libre/rePKGBUILD1
-rw-r--r--social/diaspora-git/PKGBUILD113
-rw-r--r--social/diaspora-git/diaspora.bin5
-rw-r--r--social/diaspora-git/diaspora.install3
9 files changed, 117 insertions, 60 deletions
diff --git a/gnu/README b/gnu/README
new file mode 100644
index 000000000..1b506dae2
--- /dev/null
+++ b/gnu/README
@@ -0,0 +1 @@
+This repo is for GNU software needed for some gnu.org tasks
diff --git a/gnu/gnun/PKGBUILD b/gnu/gnun/PKGBUILD
new file mode 100644
index 000000000..00b5b8116
--- /dev/null
+++ b/gnu/gnun/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+#
+
+pkgname=gnun
+pkgver=0.4
+pkgrel=1
+arch=('any')
+license=('GPL3')
+pkgdesc="Build system for gnu.org translations"
+url="http://www.gnu.org/software/gnun/"
+depends=('guile' 'po4a' 'libxml2')
+makedepends=('heirloom-mailx' 'cvs' 'svn')
+optdepends=('cvs: for CVS support'
+ 'subversion: for Subversion support')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('3baf8a16cc017e6335e65975c7223ac8'
+ '9bd1bada0b07154cf3e1c1cf937194e7')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install install-info
+}
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index fc7ebe757..cfd053a4c 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=file-roller
pkgname=file-roller-libre
-pkgver=3.2.0
+pkgver=3.2.2
pkgrel=1
pkgdesc="Archive manipulator for GNOME"
arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ options=('!libtool' '!emptydirs')
install=file-roller.install
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('00fc74269978b6e455fea97f22ba81b588bdf3e79548003b75f3328104b418b6')
+sha256sums=('de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -39,4 +39,3 @@ package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-
diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD
index 03652ec06..d94638df2 100644
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-libre/rePKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
source PKGBUILD
-CARCH=x86_64
+#CARCH=x86_64
unset build package md5sums source
_repo=extra # Put the repo here
_mirror=ftp://ftp.archlinux.org # Put mirror here
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 4dd9b5b0b..2602022f4 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -5,17 +5,17 @@
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34344
+pkgver=34426
pkgrel=1
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass')
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
license=('GPL')
url="http://www.mplayerhq.hu/"
options=(!buildflags !emptydirs)
source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('e4016248418b8f9d55b540d68b6cfee2'
+md5sums=('ff81117293e76b59e54debc439d8e612'
'c0d6ef795cf6de48e3b87ff7c23f0319')
build() {
@@ -46,9 +46,9 @@ package_mplayer-libre() {
pkgdesc="A movie player for linux (no unfree faac support)"
install=mplayer.install
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
- depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'speex'
- 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
- 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
+ depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl'
+ 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+ 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
provides=("mplayer=$pkgver")
replaces=('mplayer')
conflicts=('mplayer')
@@ -67,8 +67,8 @@ package_mplayer-libre() {
package_mencoder-libre() {
pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
- depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' 'speex'
- 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass')
+ depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+ 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray')
provides=("mencoder=$pkgver")
replaces=('mencoder')
conflicts=('mencoder')
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
index 1e382761c..6a0c46222 100644
--- a/libre/thunderbird-libre/rePKGBUILD
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -5,7 +5,6 @@
# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
source PKGBUILD
-CARCH=x86_64
unset build package md5sums source
_repo=extra
options=(!strip)
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD
index b15f66916..1cf183cf7 100644
--- a/social/diaspora-git/PKGBUILD
+++ b/social/diaspora-git/PKGBUILD
@@ -5,24 +5,33 @@
# After installing, see the Diaspora wiki page for more information:
# https://wiki.archlinux.org/index.php/Diaspora
-pkgname=diaspora-git
+pkgbase=diaspora-git
+pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git')
pkgver=20110623
pkgrel=1
pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network"
arch=('i686' 'x86_64')
-url="http://www.joindiaspora.com/"
+url="https://diasporafoundation.org/"
license=('AGPL3')
-depends=('ruby' 'mysql-ruby' 'redis' 'imagemagick' 'libxslt')
+depends=('ruby' 'redis' 'imagemagick' 'libxslt')
makedepends=('git' 'ruby-headers')
+provides=('diaspora')
install=diaspora.install
source=('diaspora.bin'
'diaspora.rc'
'diaspora.logrotate'
'diaspora.pam')
+md5sums=('440ce2511485855030e74e28843a037d'
+ '7bffaaee41b515247ba19a19c77dc5bf'
+ '60f6b3972c73cbc6b1c9ab87c88fb655'
+ '96f82c38f3f540b53f3e5144900acf17')
-_gitroot="http://github.com/diaspora/diaspora.git"
+_gitroot="https://github.com/diaspora/diaspora.git"
_gitname="diaspora"
+# I use this because I'm behind an asshole proxy
+tsocks=tsocks
+
build() {
cd "$srcdir"
@@ -43,59 +52,75 @@ build() {
[[ -d $_gitname-build ]] && rm -fr $_gitname-build
git clone $_gitname $_gitname-build
- # Recover gems cache
- rm -fr $_gitname-gems
- mkdir -p $_gitname-gems
- [[ -d cache ]] && mv cache $_gitname-gems
-
# Include all gems
- export GEM_HOME="$srcdir/$_gitname-gems"
- export GEM_PATH="$srcdir/$_gitname-gems"
+ export GEM_HOME="${PWD}/vendor"
+ export GEM_PATH="${PWD}/vendor"
export PATH="${PATH}:${GEM_PATH}/bin"
+ cd ${srcdir}/${_gitname}-build
+
gem install bundler
+}
+
+# Helper
+_package() {
+ cd "${srcdir}"
+
+ usrdir="${pkgdir}/usr/share/webapps"
+
+ install -d "${usrdir}"
+ cp -a ${_gitname}-build "${usrdir}/${_gitname}"
+
+ cd "${usrdir}/${_gitname}"
- # Patch ruby_core_source to not install the headers in the system
- # Remove this if you are behind a proxy and install the ruby-headers package instead
-# gem install ruby_core_source
-# sed -i "s@^ dest_dir.*@ dest_dir = \"$srcdir/rubyhdrs/\" + ruby_dir@" \
-# $_gitname-gems/gems/ruby_core_source*/lib/ruby_core_source.rb
+# Set the example config
+ sed -e 's/rails_env:.*/rails_env: "production"/' \
+ -e "s/db:.*/db: \"${DB}\"/" \
+ -i config/script_server.yml.example
- pushd $_gitname-build
- bundle install --path vendor
+ ${tsocks} bundle install --local --path vendor --without development test
- # We make this now because we do not install the git history
- tar czf public/source.tar.gz `git ls-tree -r master | awk '{print $4}'`
+ find -type d -name ".git" -exec rm -fr '{}' \; &>/dev/null || true
- rm -fr .git
- popd
+ install -Dm755 ${_gitname}.bin "${pkgdir}/usr/bin/${_gitname}"
+ install -Dm755 ${_gitname}.rc "${pkgdir}/etc/rc.d/${_gitname}"
+ install -Dm644 ${_gitname}.logrotate "${pkgdir}/etc/logrotate.d/${_gitname}"
+ install -Dm644 ${_gitname}.pam "${pkgdir}/etc/pam.d/${_gitname}"
- # Keep the gems cache
- mv $_gitname-gems/cache "$srcdir"
+ install -d ${pkgdir}/usr/share/licenses/${_gitname}/
+ install -Dm644 ${srcdir}/${_gitname}-build/{AUTHORS,COPYRIGHT,GNU-AGPL-3.0} \
+ ${pkgdir}/usr/share/licenses/${_gitname}/
}
-package() {
- cd "$srcdir"
- options=(!strip)
+package_diaspora-mysql-git() {
+ pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network (MySQL version)"
+ provides=('diaspora-mysql' 'diaspora')
+ depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'mysql')
+ options=(!strip)
+
+ export DB="mysql"
- usrdir="$pkgdir/usr/share/webapps"
+ _package
+}
- install -d "$usrdir"
- cp -r $_gitname-build "$usrdir/$_gitname"
- #cp -r $_gitname-gems "$usrdir/"
- find "$usrdir/$_gitname-gems" \
- -type d -name ".git" -exec rm -fr '{}' \; &>/dev/null || true
+package_diaspora-postgresql-git() {
+ pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network (PostgreSQL version)"
+ provides=('diaspora-postgresql' 'diaspora')
+ depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'postgresql')
+ options=(!strip)
- install -Dm755 $_gitname.bin "$pkgdir/usr/bin/$_gitname"
- install -Dm755 $_gitname.rc "$pkgdir/etc/rc.d/$_gitname"
- install -Dm644 $_gitname.logrotate "$pkgdir/etc/logrotate.d/$_gitname"
- install -Dm644 $_gitname.pam "$pkgdir/etc/pam.d/$_gitname"
+ export DB="postgresql"
- install -d $pkgdir/usr/share/licenses/$_gitname/
- install -Dm644 ${srcdir}/$_gitname-build/{AUTHORS,COPYRIGHT,GNU-AGPL-3.0} \
- $pkgdir/usr/share/licenses/$_gitname/
+ _package
+}
+
+package_diaspora-sqlite-git() {
+ pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network (SQLite3 version)"
+ provides=('diaspora-sqlite' 'diaspora')
+ depends=('ruby' 'redis' 'imagemagick' 'libxslt' 'sqlite3')
+ options=(!strip)
+
+ export DB="sqlite"
+
+ _package
}
-md5sums=('7e7402127f9a05bc58aff0adc5057d1c'
- '7bffaaee41b515247ba19a19c77dc5bf'
- '60f6b3972c73cbc6b1c9ab87c88fb655'
- '96f82c38f3f540b53f3e5144900acf17')
diff --git a/social/diaspora-git/diaspora.bin b/social/diaspora-git/diaspora.bin
index d18a40014..2168c7e7c 100644
--- a/social/diaspora-git/diaspora.bin
+++ b/social/diaspora-git/diaspora.bin
@@ -1,3 +1,6 @@
+#!/bin/bash
+
cd /usr/share/webapps/diaspora
-export GEM_HOME=/usr/share/webapps/diaspora-gems/
+export GEM_HOME=${PWD}/vendor
+
./script/server &>>/var/log/diaspora.log
diff --git a/social/diaspora-git/diaspora.install b/social/diaspora-git/diaspora.install
index faf2cb78f..7833be058 100644
--- a/social/diaspora-git/diaspora.install
+++ b/social/diaspora-git/diaspora.install
@@ -1,12 +1,11 @@
dusr=diaspora
dhome=/usr/share/webapps/diaspora
-dgems=/usr/share/webapps/diaspora-gems
dlog=/var/log/diaspora.log
post_install() {
getent passwd $dusr &>/dev/null || useradd -r -d $dhome -s /bin/bash $dusr &>/dev/null
- chown -R $dusr:$dusr $dhome $dgems &>/dev/null
+ chown -R $dusr:$dusr $dhome &>/dev/null
[[ -f $dlog ]] && chown $dusr:$dusr $dlog
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 15:39:08 +0000