summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-05-12 16:32:55 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-05-12 16:32:55 -0300
commite3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00 (patch)
treeda2f71ca3469aea362df4b9885b01bcc068bfc91 /pcr
parent6abc75d5f0c4d5c8302715a7da59cc02d22fbe36 (diff)
parent8d0f4ac4cbf56fc5c5cadb5ba09c35e3674a886b (diff)
downloadabslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.gz
abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.bz2
abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.zip
Merge branch 'master' of vparabola:abslibre
Conflicts: pcr/tomb/PKGBUILD
Diffstat (limited to 'pcr')
-rw-r--r--pcr/font-manager/0001-nonexistent_cache.patch71
-rw-r--r--pcr/font-manager/1001-gcc47.patch18
-rw-r--r--pcr/font-manager/2001-paths.patch25
-rw-r--r--pcr/font-manager/2002-local-fontconfig-path.patch11
-rw-r--r--pcr/font-manager/2003-file-roller-syntax-fix.patch22
-rw-r--r--pcr/font-manager/PKGBUILD58
-rw-r--r--pcr/git-remote-mediawiki/PKGBUILD29
-rw-r--r--pcr/git-send-email/PKGBUILD12
-rw-r--r--pcr/gnash/PKGBUILD59
-rw-r--r--pcr/gnash/gnash-gtk.install22
-rw-r--r--pcr/gnash/nodebug.patch48
-rw-r--r--pcr/gnome-boxes-libre/PKGBUILD44
-rw-r--r--pcr/gnome-boxes-libre/free-distros.patch11
-rw-r--r--pcr/gnome-boxes-libre/gnome-boxes.install17
-rw-r--r--pcr/gnome-boxes-libre/logos.patch39
-rw-r--r--pcr/libosinfo-libre/PKGBUILD63
-rw-r--r--pcr/libosinfo-libre/data.patch137
-rw-r--r--pcr/libosinfo-libre/free-distros.patch123
-rw-r--r--pcr/libosinfo-libre/po.patch34
-rw-r--r--pcr/libosinfo-libre/test.patch87
-rw-r--r--pcr/lostfiles/PKGBUILD5
-rwxr-xr-xpcr/md5deep/PKGBUILD26
-rw-r--r--pcr/multipath-tools-git/PKGBUILD44
-rw-r--r--pcr/multipath-tools/PKGBUILD56
-rw-r--r--pcr/multipath-tools/blacklist-cciss-devices.patch30
-rw-r--r--pcr/multipath-tools/buffer-overflows.patch13
-rw-r--r--pcr/multipath-tools/multipath-tools.install9
-rw-r--r--pcr/python2-polib/PKGBUILD25
-rw-r--r--pcr/retroshare/PKGBUILD25
-rw-r--r--pcr/ryzom-hg/PKGBUILD14
-rw-r--r--pcr/tomb/PKGBUILD17
-rw-r--r--pcr/twinkle/PKGBUILD4
-rw-r--r--pcr/youtube-dl-current/PKGBUILD4
33 files changed, 521 insertions, 681 deletions
diff --git a/pcr/font-manager/0001-nonexistent_cache.patch b/pcr/font-manager/0001-nonexistent_cache.patch
new file mode 100644
index 000000000..effd89320
--- /dev/null
+++ b/pcr/font-manager/0001-nonexistent_cache.patch
@@ -0,0 +1,71 @@
+Description: Don't remove cache dir if non-existent.
+Origin: upstream, http://code.google.com/p/font-manager/source/detail?r=261
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=658328
+---
+ src/lib/fm-fontutils.c | 16 ++++++++--------
+ src/ui/fontconfig.py | 8 +++++---
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+--- font-manager.orig/src/lib/fm-fontutils.c
++++ font-manager/src/lib/fm-fontutils.c
+@@ -72,8 +72,8 @@ FcListFiles()
+ {
+ FcChar8 *file;
+
+- FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &file);
+- filelist = g_slist_prepend(filelist, g_strdup((const gchar *) file));
++ if (FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &file) == FcResultMatch)
++ filelist = g_slist_prepend(filelist, g_strdup((const gchar *) file));
+ }
+
+ if (objectset)
+@@ -272,7 +272,7 @@ _get_base_font_info(FontInfo *fontinfo,
+ PangoFontDescription *descr;
+
+ /* Need to add this font to the configuration, it may not be there in the
+- * case where this the font is not installed yet or possibly just installed
++ * case where this font is not installed yet or possibly just installed
+ */
+ FcConfigAppFontAddFile(FcConfigGetCurrent(), filepath);
+
+@@ -287,10 +287,10 @@ _get_base_font_info(FontInfo *fontinfo,
+ FcChar8 *family,
+ *style;
+
+- FcPatternGetString(fontset->fonts[i], FC_FAMILY, 0, &family);
+- FcPatternGetString(fontset->fonts[i], FC_STYLE, 0, &style);
+- ADD_PROP(fontinfo->family, family);
+- ADD_PROP(fontinfo->style, style);
++ if (FcPatternGetString(fontset->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
++ ADD_PROP(fontinfo->family, family);
++ if (FcPatternGetString(fontset->fonts[i], FC_STYLE, 0, &style) == FcResultMatch)
++ ADD_PROP(fontinfo->style, style);
+ }
+
+ descr = pango_fc_font_description_from_pattern(pattern, FALSE);
+@@ -539,7 +539,7 @@ static const struct
+ }
+ NoticeData[] =
+ {
+- {"Bigelow", "B&H"},
++ {"Bigelow", "Bigelow & Holmes"},
+ {"Adobe", "Adobe"},
+ {"Bitstream", "Bitstream"},
+ {"Monotype", "Monotype"},
+--- font-manager.orig/src/ui/fontconfig.py
++++ font-manager/src/ui/fontconfig.py
+@@ -376,9 +376,11 @@ class ConfigEdit(gtk.Window):
+ for name in self.cache.iterkeys():
+ discard_fontconfig_settings(self.cache[name])
+ self.save_settings(None)
+- os.unlink(join(CACHE_DIR, CACHED_SETTINGS))
+- os.unlink(join(USER_FONT_CONFIG_DIR,
+- '25-{0}.conf'.format(self.selected_family.get_name())))
++ cache = join(CACHE_DIR, CACHED_SETTINGS)
++ not exists(cache) or os.unlink(cache)
++ cache = join(USER_FONT_CONFIG_DIR,
++ '25-{0}.conf'.format(self.selected_family.get_name()))
++ not exists(cache) or os.unlink(cache)
+ return
+
+ def save_cache(self):
diff --git a/pcr/font-manager/1001-gcc47.patch b/pcr/font-manager/1001-gcc47.patch
new file mode 100644
index 000000000..1563c71ce
--- /dev/null
+++ b/pcr/font-manager/1001-gcc47.patch
@@ -0,0 +1,18 @@
+Description: Fix missing #includes to prevent FTBFS with GCC 4.7.
+Author: Alessio Treglia <alessio@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672043
+Forwarded: http://code.google.com/p/font-manager/issues/detail?id=71
+---
+ src/lib/fm-fontutils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- font-manager.orig/src/lib/fm-fontutils.c
++++ font-manager/src/lib/fm-fontutils.c
+@@ -21,6 +21,7 @@
+ * Boston, MA 02110-1301, USA
+ */
+
++#include <unistd.h>
+ #include <glib.h>
+ #include <glib/gprintf.h>
+ #include <glib/gstdio.h>
diff --git a/pcr/font-manager/2001-paths.patch b/pcr/font-manager/2001-paths.patch
new file mode 100644
index 000000000..2c15232fc
--- /dev/null
+++ b/pcr/font-manager/2001-paths.patch
@@ -0,0 +1,25 @@
+Description: Fixes file location constants to more updated/organized variants.
+ ~/.fonts.conf -> ~/.config/fontconfig/fonts.conf
+ ~/.fonts/ -> ~/.local/share/fonts/
+Author: i_magnific0 (i_magnific0@yahoo.com)
+Notes: patch not submitted
+---
+ src/constants.py.in | 4 ++--
+ 1 file changed, 2 insertion(+), 2 deletions(-)
+
+--- font-manager.orig/src/constants.py.in
++++ font-manager/src/constants.py
+@@ -75,11 +75,11 @@
+
+ HOME = os.getenv('HOME')
+ USER = os.getenv('USER')
+-USER_FONT_DIR = join(HOME, '.fonts')
++USER_FONT_DIR = join(glib.get_user_data_dir(), 'fonts')
+ COMPAT_COLLECTIONS = join(CONFIG_DIR, 'fontgroups.xml')
+ USER_FONT_COLLECTIONS = join(DATA_DIR, 'Collections.xml')
+ USER_FONT_COLLECTIONS_BAK = join(DATA_DIR, 'Collections.xml.bak')
+-USER_FONT_CONFIG = join(HOME, '.fonts.conf')
++USER_FONT_CONFIG = join(CONFIG_DIR, 'fontconfig/fonts.conf')
+ USER_FONT_CONFIG_DIR = join(APP_CONFIG_DIR, 'conf.d')
+ USER_FONT_CONFIG_DIRS = join(APP_CONFIG_DIR, 'directories.conf')
+ USER_FONT_CONFIG_RENDER = join(APP_CONFIG_DIR, 'local.conf')
diff --git a/pcr/font-manager/2002-local-fontconfig-path.patch b/pcr/font-manager/2002-local-fontconfig-path.patch
new file mode 100644
index 000000000..b3c65cc5c
--- /dev/null
+++ b/pcr/font-manager/2002-local-fontconfig-path.patch
@@ -0,0 +1,11 @@
+--- font-manager/src/core/__init__.py.in 2010-12-24 11:05:14.000000000 +0800
++++ font-manager/src/core/__init__.py.in 2013-06-12 21:15:28.294418494 +0800
+@@ -882,7 +882,7 @@
+ # Make sure we have everything we need to run properly
+ _setup_logging()
+ for folder in CACHE_DIR, CONFIG_DIR, APP_CONFIG_DIR, AUTOSTART_DIR, DATA_DIR, \
+- USER_FONT_CONFIG_DIR, USER_FONT_DIR, USER_LIBRARY_DIR:
++ USER_FONT_CONFIG_DIR, USER_FONT_DIR, USER_LIBRARY_DIR, join(CONFIG_DIR, 'fontconfig'):
+ if not exists(folder):
+ os.makedirs(folder, 0755)
+ if folder == USER_FONT_DIR:
diff --git a/pcr/font-manager/2003-file-roller-syntax-fix.patch b/pcr/font-manager/2003-file-roller-syntax-fix.patch
new file mode 100644
index 000000000..229e13dc6
--- /dev/null
+++ b/pcr/font-manager/2003-file-roller-syntax-fix.patch
@@ -0,0 +1,22 @@
+--- font-manager/src/utils/common.py 2010-12-20 12:47:37.000000000 +0800
++++ font-manager/src/utils/common.py 2013-06-12 22:09:06.296985078 +0800
+@@ -146,7 +146,7 @@
+
+ If delete is True, folder will be deleted afterwards
+ """
+- archiver = """file-roller -a '{0}.{1}' '{2}'""".format(arch_name,
++ archiver = """file-roller --add-to='{0}.{1}' '{2}'""".format(arch_name,
+ arch_type, folder)
+ os.chdir(destination)
+ roller = subprocess.Popen(shlex.split(archiver))
+--- font-manager/src/core/fonts.py 2010-12-20 13:14:43.000000000 +0800
++++ font-manager/src/core/fonts.py 2013-06-12 22:26:29.084669145 +0800
+@@ -524,7 +524,7 @@
+ tmp_dir = tempfile.mkdtemp(suffix='-font-manager', prefix='tmp-')
+ arch_dir = join(tmp_dir, dir_name)
+ os.mkdir(arch_dir)
+- subprocess.call(['file-roller', '-e', arch_dir, filepath])
++ subprocess.call(['file-roller', '--extract-to=' + arch_dir, filepath])
+ # Todo: Need to check whether archive actually contained any fonts
+ # if user_is_stupid:
+ # self.notify()
diff --git a/pcr/font-manager/PKGBUILD b/pcr/font-manager/PKGBUILD
new file mode 100644
index 000000000..7224df504
--- /dev/null
+++ b/pcr/font-manager/PKGBUILD
@@ -0,0 +1,58 @@
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+# Contributor: Guan 'kuno' Qing <neokuno(at)gmail(dot)com>
+# Contributor: Guten Ye <ywzhaifei(at)gmail(dot)com>
+# Contributor: i_magnific0 <i_magnific0(at)yahoo(dot)com>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+
+pkgname=font-manager
+pkgver=0.5.7
+pkgrel=4
+pkgdesc="A font management application for the GNOME desktop"
+url="http://code.google.com/p/font-manager/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('pygtk>=2.0' 'libxml2' 'fontconfig')
+optdepends=('file-roller: to import/export font collections to archives'
+ 'gucharmap: to view selected font using GNOME character map application'
+ 'python-reportlab: to create PDF sample sheets')
+source=(http://font-manager.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+ 0001-nonexistent_cache.patch
+ 1001-gcc47.patch
+ 2001-paths.patch
+ 2002-local-fontconfig-path.patch
+ 2003-file-roller-syntax-fix.patch)
+md5sums=('7cd3b635eaddcb84a8b31509880510ed'
+ '50e732de1a92bc498d4cffd39185225c'
+ '727acfbbce4ab8d05078e4719443ce29'
+ 'a9a3cfc9433a0a4c710d4192f34760b9'
+ '119c5049113dadbf54aa4d2edf243d97'
+ '1daadcf92126caa46a628710fd07ae41')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc
+ sed -i -e 's/^PYTHON.*/PYTHON=\/usr\/bin\/python2/' Makefile
+
+ # apply patches from Debian
+ # source: http://ftp.de.debian.org/debian/pool/main/f/font-manager/font-manager_0.5.7-4.debian.tar.gz
+ patch -Np1 < ../0001-nonexistent_cache.patch
+ patch -Np1 < ../1001-gcc47.patch
+
+ # apply config file location constants patch by i_magnific0
+ # source: https://github.com/magnific0/font-manager
+ patch -Np1 < ../2001-paths.patch
+
+ # apply patch to create local fontconfig path if not found
+ patch -Np1 < ../2002-local-fontconfig-path.patch
+
+ # apply patch to fix file-roller command line syntax
+ patch -Np1 < ../2003-file-roller-syntax-fix.patch
+
+ # build
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir}/ install
+}
diff --git a/pcr/git-remote-mediawiki/PKGBUILD b/pcr/git-remote-mediawiki/PKGBUILD
index 8fb47724a..d5ffd33be 100644
--- a/pcr/git-remote-mediawiki/PKGBUILD
+++ b/pcr/git-remote-mediawiki/PKGBUILD
@@ -1,10 +1,12 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
pkgname=git-remote-mediawiki
url=https://github.com/moy/Git-Mediawiki/wiki
license=('GPL') # GPLv2+
pkgdesc="Support for MediaWiki remotes in git"
-pkgver=1.8.5.1
-pkgrel=2
+pkgver=1.9.2
+pkgrel=1
arch=('any')
depends=(
git
@@ -14,18 +16,15 @@ depends=(
perl-mediawiki-api
)
-_symlink() {
- local src=$1
- local dst=$2
- mkdir -p "${pkgdir}/${dst%/*}"
- ln -s "$(realpath "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
-}
-
package() {
- _mwdir=/usr/share/git/mw-to-git
- _perldir=/usr/share/perl5/vendor_perl
- _gitdir=/usr/lib/git-core
- _symlink ${_mwdir}/Git/Mediawiki.pm ${_perldir}/Git/Mediawiki.pm
- _symlink ${_mwdir}/git-mw.perl ${_gitdir}/git-mw
- _symlink ${_mwdir}/git-remote-mediawiki.perl ${_gitdir}/git-remote-mediawiki
+ local _mwdir=/usr/share/git/mw-to-git
+ local _perldir=/usr/share/perl5/vendor_perl
+ local _gitdir=/usr/lib/git-core
+
+ install -d "$pkgdir"/$_perldir/Git
+ install -d "$pkgdir"/$_gitdir
+
+ ln -srT "$pkgdir"/${_mwdir}/Git/Mediawiki.pm "$pkgdir"/${_perldir}/Git/Mediawiki.pm
+ ln -srT "$pkgdir"/${_mwdir}/git-mw.perl "$pkgdir"/${_gitdir}/git-mw
+ ln -srT "$pkgdir"/${_mwdir}/git-remote-mediawiki.perl "$pkgdir"/${_gitdir}/git-remote-mediawiki
}
diff --git a/pcr/git-send-email/PKGBUILD b/pcr/git-send-email/PKGBUILD
new file mode 100644
index 000000000..22d484073
--- /dev/null
+++ b/pcr/git-send-email/PKGBUILD
@@ -0,0 +1,12 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=git-send-email
+pkgver=1.9.2
+pkgdesc="Meta-package for packages nescessary for git send-email"
+url="http://git-scm.com/"
+license=('GPL2')
+
+pkgrel=1
+arch=(any)
+
+depends=(git perl-mime-tools perl-net-smtp-ssl perl-authen-sasl)
diff --git a/pcr/gnash/PKGBUILD b/pcr/gnash/PKGBUILD
new file mode 100644
index 000000000..f932fa084
--- /dev/null
+++ b/pcr/gnash/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 107172 2014-03-14 00:14:28Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnash
+pkgdesc="A GNU Flash movie player"
+pkgver=0.8.11dev
+pkgrel=2
+arch=(i686 x86_64)
+url="http://www.gnu.org/software/gnash/"
+license=(GPL3)
+depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu speex fontconfig cairo ffmpeg jemalloc boost-libs gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext)
+makedepends=(libtool mesa xulrunner pkgconfig boost git)
+provides=(gnash-common gnash-gtk)
+conflicts=(gnash-common gnash-gtk)
+replaces=(gnash-common gnash-gtk)
+options=(!emptydirs)
+backup=(etc/gnashrc etc/gnashthumbnailrc etc/gnashpluginrc)
+install=gnash-gtk.install
+source=('gnash::git://git.sv.gnu.org/gnash.git#commit=a3180f2'
+ nodebug.patch)
+sha256sums=('SKIP'
+ '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
+
+
+prepare() {
+ cd gnash
+
+ # Disable very, very verbose debugging (gigabytes of logs)
+ patch -Np1 -i ../nodebug.patch
+
+ ./autogen.sh
+}
+
+build() {
+ cd gnash
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-plugins-install=system \
+ --with-npapi-plugindir=/usr/lib/mozilla/plugins \
+ --enable-gui=sdl,gtk,dump \
+ --enable-media=ffmpeg \
+ --enable-renderer=all \
+ --enable-device=x11
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+ make
+}
+
+package() {
+ cd gnash
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install install-plugin
+
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \
+ "$pkgdir"/usr/share/applications/*.schemas
+ rm -f "$pkgdir"/usr/share/applications/*.schemas
+}
diff --git a/pcr/gnash/gnash-gtk.install b/pcr/gnash/gnash-gtk.install
new file mode 100644
index 000000000..6678a7f8a
--- /dev/null
+++ b/pcr/gnash/gnash-gtk.install
@@ -0,0 +1,22 @@
+post_install() {
+ gconfpkg --install gnash
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ gconfpkg --uninstall gnash
+}
+
+post_remove() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/pcr/gnash/nodebug.patch b/pcr/gnash/nodebug.patch
new file mode 100644
index 000000000..ca160b898
--- /dev/null
+++ b/pcr/gnash/nodebug.patch
@@ -0,0 +1,48 @@
+diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h
+--- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100
++++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100
+@@ -331,27 +331,27 @@
+
+ // Define to 0 to completely remove parse debugging at compile-time
+ #ifndef VERBOSE_PARSE
+-#define VERBOSE_PARSE 1
++#define VERBOSE_PARSE 0
+ #endif
+
+ // Define to 0 to completely remove action debugging at compile-time
+ #ifndef VERBOSE_ACTION
+-#define VERBOSE_ACTION 1
++#define VERBOSE_ACTION 0
+ #endif
+
+ // Define to 0 to remove ActionScript errors verbosity at compile-time
+ #ifndef VERBOSE_ASCODING_ERRORS
+-#define VERBOSE_ASCODING_ERRORS 1
++#define VERBOSE_ASCODING_ERRORS 0
+ #endif
+
+ // Define to 0 this to remove invalid SWF verbosity at compile-time
+ #ifndef VERBOSE_MALFORMED_SWF
+-#define VERBOSE_MALFORMED_SWF 1
++#define VERBOSE_MALFORMED_SWF 0
+ #endif
+
+ // Define to 0 this to remove Networking verbosity at compile-time
+ #ifndef VERBOSE_NETWORKING
+-#define VERBOSE_NETWORKING 1
++#define VERBOSE_NETWORKING 0
+ #endif
+
+ #if VERBOSE_PARSE
+diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp
+--- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100
+@@ -46,7 +46,7 @@
+ // too much information for my tastes. I really want just
+ // to see how stack changes while executing actions...
+ // --strk Fri Jun 30 02:28:46 CEST 2006
+-# define DEBUG_STACK 1
++//# define DEBUG_STACK 1
+
+ // Max number of stack item to dump. 0 for unlimited.
+ # define STACK_DUMP_LIMIT 32
diff --git a/pcr/gnome-boxes-libre/PKGBUILD b/pcr/gnome-boxes-libre/PKGBUILD
deleted file mode 100644
index 91a3b41be..000000000
--- a/pcr/gnome-boxes-libre/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname='gnome-boxes'
-pkgname="$_pkgname-libre"
-pkgver='3.10.2'
-pkgrel='1'
-pkgdesc='A simple GNOME 3 application to access remote or virtual systems, without nonfree system logos'
-arch=('i686' 'x86_64')
-url='https://wiki.gnome.org/Apps/Boxes'
-license=('LGPL')
-depends=('clutter-gtk' 'desktop-file-utils' 'gtk-vnc' 'libosinfo' 'libsoup' 'libtracker-sparql' 'libvirt-glib'
- 'spice-gtk3')
-makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala')
-optdepends=('qemu-usbredir: virtual machines support')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-install='gnome-boxes.install'
-source=("http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz" 'logos.patch'
- 'free-distros.patch')
-sha256sums=('9e055627cff5f59323bc95ad65ab361fc26328854d5a421bd09c899c466f2ec4'
- '63d8a7fb5e0d6260d56bd92e9d11f39e9f37c323a261bc822a589b85f760b254'
- '025e56fff5ae3659abc867ef1b5739a4632c91fa7f10d54d0853e9905355a15f')
-
-prepare() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- patch -Np1 -i "$srcdir/logos.patch"
-
- patch -Np1 -i "$srcdir/free-distros.patch"
-}
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/gnome-boxes-libre/free-distros.patch b/pcr/gnome-boxes-libre/free-distros.patch
deleted file mode 100644
index d83d2ca4b..000000000
--- a/pcr/gnome-boxes-libre/free-distros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original 2013-11-23 13:26:20.013010981 +0100
-+++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml 2013-11-23 14:29:33.237567173 +0100
-@@ -2,4 +2,8 @@
-
- <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
-
-+ <os id="https://parabolagnulinux.org">
-+ <logo>https://projects.parabolagnulinux.org/artwork.git/plain/official-2013/optimized-text/logo.svg</logo>
-+ </os>
-+
- </libosinfo>
diff --git a/pcr/gnome-boxes-libre/gnome-boxes.install b/pcr/gnome-boxes-libre/gnome-boxes.install
deleted file mode 100644
index 2ceb2ac08..000000000
--- a/pcr/gnome-boxes-libre/gnome-boxes.install
+++ /dev/null
@@ -1,17 +0,0 @@
-update() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_install() {
- update
-}
-
-post_upgrade() {
- update
-}
-
-post_remove() {
- update
-}
diff --git a/pcr/gnome-boxes-libre/logos.patch b/pcr/gnome-boxes-libre/logos.patch
deleted file mode 100644
index 6fe80a2eb..000000000
--- a/pcr/gnome-boxes-libre/logos.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original 2013-11-16 22:30:08.198540527 +0100
-+++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml 2013-11-16 22:30:12.135269885 +0100
-@@ -2,36 +2,4 @@
-
- <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
-
-- <os id="http://debian.org/debian/1.0">
-- <logo>http://www.debian.org/logos/openlogo-nd.svg</logo>
-- </os>
--
-- <os id="http://fedoraproject.org/fedora/1">
-- <logo>http://people.gnome.org/~zeeshanak/logos/fedora.svg</logo>
-- </os>
--
-- <os id="http://opensuse.org/opensuse/10.2">
-- <logo>http://people.gnome.org/~zeeshanak/logos/opensuse.svg</logo>
-- </os>
--
-- <os id="http://ubuntu.com/ubuntu/4.10">
-- <logo>http://people.gnome.org/~zeeshanak/logos/ubuntu.svg</logo>
-- </os>
--
-- <os id="http://gnome.org/3.6">
-- <logo>http://people.gnome.org/~zeeshanak/logos/gnome-logo.svg</logo>
-- </os>
--
-- <os id="http://redhat.com/rhel/4.0">
-- <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
-- </os>
--
-- <os id="http://redhat.com/rhel/5.0">
-- <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
-- </os>
--
-- <os id="http://redhat.com/rhel/6.0">
-- <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
-- </os>
--
- </libosinfo>
diff --git a/pcr/libosinfo-libre/PKGBUILD b/pcr/libosinfo-libre/PKGBUILD
deleted file mode 100644
index 8400558c0..000000000
--- a/pcr/libosinfo-libre/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname='libosinfo'
-pkgname="$_pkgname-libre"
-pkgver='0.2.8'
-pkgrel='1'
-pkgdesc='A GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems'
-arch=('i686' 'x86_64')
-url='http://libosinfo.org'
-license=('LGPL')
-depends=('glib2' 'libxslt')
-makedepends=('intltool' 'libsoup')
-checkdepends=('check')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-source=("https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz" 'data.patch' 'po.patch' 'test.patch'
- 'free-distros.patch')
-sha256sums=('50cbfcff4548f37b5b7d3328cbc6e96fe6c2a48696e31eec0c819d161e38c643'
- 'fdfb0753a7cf7865ac2ea5b17145f90d27d70e18c69fba0d60dfb43629ea0dac'
- 'aab885d2b3a7f91a79efd7ab6f12fe1d4b264afa0fbc200268838b353600b338'
- 'c4b328f36973931abd71a10a62ec590ef3ba1177486179bc96aa47a22a6d0a42'
- 'f4b79c44ae4a39325480c2b0af4aa7ed086cc1cab7c9ba1119f50967a9a5f4ca')
-
-prepare() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- rm data/datamaps/windows-lang.xml \
- data/hypervisors/rhel-xen.xml{,.in} \
- data/install-scripts/*.xml \
- data/oses/*.xml{,.in}
- rm -r test/isodata/*
-
- patch -Np1 -i "$srcdir/data.patch"
- patch -Np1 -i "$srcdir/po.patch"
- patch -Np1 -i "$srcdir/test.patch"
-
- cd "$srcdir/$_pkgname-$pkgver/po"
- intltool-update pl
- intltool-update uk
- cd "$srcdir/$_pkgname-$pkgver"
-
- patch -Np1 -i "$srcdir/free-distros.patch"
-}
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- make -k check
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/libosinfo-libre/data.patch b/pcr/libosinfo-libre/data.patch
deleted file mode 100644
index d37d30671..000000000
--- a/pcr/libosinfo-libre/data.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.am libosinfo-0.2.8-libre/data/datamaps/Makefile.am
---- libosinfo-0.2.8/data/datamaps/Makefile.am 2013-01-09 00:01:25.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/datamaps/Makefile.am 2013-12-01 12:15:00.261131308 +0100
-@@ -1,7 +1,6 @@
-
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA = \
-- windows-lang.xml \
- x11-keyboard.xml \
- $(NULL)
-
-diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.in libosinfo-0.2.8-libre/data/datamaps/Makefile.in
---- libosinfo-0.2.8/data/datamaps/Makefile.in 2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/datamaps/Makefile.in 2013-12-01 12:15:07.561496625 +0100
-@@ -326,7 +326,6 @@
- top_srcdir = @top_srcdir@
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA = \
-- windows-lang.xml \
- x11-keyboard.xml \
- $(NULL)
-
-diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.am libosinfo-0.2.8-libre/data/hypervisors/Makefile.am
---- libosinfo-0.2.8/data/hypervisors/Makefile.am 2013-02-14 02:39:37.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.am 2013-12-01 12:18:54.718635301 +0100
-@@ -1,6 +1,6 @@
-
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
-
- database_DATA = $(database_in_files:.xml.in=.xml)
-
-diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.in libosinfo-0.2.8-libre/data/hypervisors/Makefile.in
---- libosinfo-0.2.8/data/hypervisors/Makefile.in 2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.in 2013-12-01 12:20:01.822560286 +0100
-@@ -325,7 +325,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- database_DATA = $(database_in_files:.xml.in=.xml)
- EXTRA_DIST = $(database_in_files) $(database_DATA)
- all: all-am
-diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.am libosinfo-0.2.8-libre/data/install-scripts/Makefile.am
---- libosinfo-0.2.8/data/install-scripts/Makefile.am 2013-03-27 23:03:14.000000000 +0100
-+++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.am 2013-12-01 12:24:10.160616083 +0100
-@@ -1,12 +1,6 @@
-
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA = \
-- fedora.xml \
-- rhel.xml \
-- windows-sif.xml \
-- windows-cmd.xml \
-- windows-reg.xml \
-- windows-unattend.xml \
- $(NULL)
-
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.in libosinfo-0.2.8-libre/data/install-scripts/Makefile.in
---- libosinfo-0.2.8/data/install-scripts/Makefile.in 2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.in 2013-12-01 12:24:20.500882542 +0100
-@@ -326,12 +326,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA = \
-- fedora.xml \
-- rhel.xml \
-- windows-sif.xml \
-- windows-cmd.xml \
-- windows-reg.xml \
-- windows-unattend.xml \
- $(NULL)
-
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.8/data/oses/Makefile.am libosinfo-0.2.8-libre/data/oses/Makefile.am
---- libosinfo-0.2.8/data/oses/Makefile.am 2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/oses/Makefile.am 2013-12-01 12:26:24.797757509 +0100
-@@ -1,26 +1,6 @@
-
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
-- altlinux.xml.in \
-- centos.xml.in \
-- debian.xml.in \
-- dos.xml.in \
-- fedora.xml.in \
-- freebsd.xml.in \
-- gnome.xml.in \
-- mandriva.xml.in \
-- mandrake.xml.in \
-- netbsd.xml.in \
-- netware.xml.in \
-- macos.xml.in \
-- openbsd.xml.in \
-- opensuse.xml.in \
-- rhl.xml.in \
-- rhel.xml.in \
-- solaris.xml.in \
-- suse.xml.in \
-- ubuntu.xml.in \
-- windows.xml.in \
- $(NULL)
-
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8/data/oses/Makefile.in libosinfo-0.2.8-libre/data/oses/Makefile.in
---- libosinfo-0.2.8/data/oses/Makefile.in 2013-09-16 18:45:26.000000000 +0200
-+++ libosinfo-0.2.8-libre/data/oses/Makefile.in 2013-12-01 12:26:32.557686417 +0100
-@@ -326,26 +326,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
-- altlinux.xml.in \
-- centos.xml.in \
-- debian.xml.in \
-- dos.xml.in \
-- fedora.xml.in \
-- freebsd.xml.in \
-- gnome.xml.in \
-- mandriva.xml.in \
-- mandrake.xml.in \
-- netbsd.xml.in \
-- netware.xml.in \
-- macos.xml.in \
-- openbsd.xml.in \
-- opensuse.xml.in \
-- rhl.xml.in \
-- rhel.xml.in \
-- solaris.xml.in \
-- suse.xml.in \
-- ubuntu.xml.in \
-- windows.xml.in \
- $(NULL)
-
- database_DATA = $(database_in_files:.xml.in=.xml)
diff --git a/pcr/libosinfo-libre/free-distros.patch b/pcr/libosinfo-libre/free-distros.patch
deleted file mode 100644
index c69cd3fed..000000000
--- a/pcr/libosinfo-libre/free-distros.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.am libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am
---- libosinfo-0.2.8-libre/data/oses/Makefile.am 2013-12-01 13:14:07.267023100 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am 2013-12-01 13:18:29.183029813 +0100
-@@ -1,6 +1,7 @@
-
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
-+ parabola.xml.in \
- $(NULL)
-
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.in libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in
---- libosinfo-0.2.8-libre/data/oses/Makefile.in 2013-12-01 13:14:07.267023100 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in 2013-12-01 13:18:48.053708302 +0100
-@@ -326,6 +326,7 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
-+ parabola.xml.in \
- $(NULL)
-
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml
---- libosinfo-0.2.8-libre/data/oses/parabola.xml 1970-01-01 01:00:00.000000000 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml 2013-12-01 13:26:26.128660679 +0100
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="https://parabolagnulinux.org">
-+ <short-id>parabola</short-id>
-+ <name>Parabola GNU/Linux-libre</name>
-+ <vendor>Parabola Project</vendor>
-+ <family>gnu/linux</family>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <cpu>1000000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>67108864</ram>
-+ <storage>524288000</storage>
-+ </minimum>
-+ <recommended>
-+ <cpu>1000000000</cpu>
-+ <ram>67108864</ram>
-+ <storage>524288000</storage>
-+ </recommended>
-+ </resources>
-+
-+ <media arch="x86_64">
-+ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+ <iso>
-+ <volume-id>PARA_201309</volume-id>
-+ </iso>
-+ <kernel>parabola/boot/x86_64/vmlinuz</kernel>
-+ <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
-+ </media>
-+ <media arch="i686">
-+ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+ <iso>
-+ <volume-id>PARA_201309</volume-id>
-+ </iso>
-+ <kernel>parabola/boot/i686/vmlinuz</kernel>
-+ <initrd>parabola/boot/i686/parabolaiso.img</initrd>
-+ </media>
-+ </os>
-+
-+</libosinfo>
-\ No newline at end of file
-diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml.in libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in
---- libosinfo-0.2.8-libre/data/oses/parabola.xml.in 1970-01-01 01:00:00.000000000 +0100
-+++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in 2013-12-01 13:17:12.086931332 +0100
-@@ -0,0 +1,42 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="https://parabolagnulinux.org">
-+ <short-id>parabola</short-id>
-+ <_name>Parabola GNU/Linux-libre</_name>
-+ <_vendor>Parabola Project</_vendor>
-+ <family>gnu/linux</family>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <cpu>1000000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>67108864</ram>
-+ <storage>524288000</storage>
-+ </minimum>
-+ <recommended>
-+ <cpu>1000000000</cpu>
-+ <ram>67108864</ram>
-+ <storage>524288000</storage>
-+ </recommended>
-+ </resources>
-+
-+ <media arch="x86_64">
-+ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+ <iso>
-+ <volume-id>PARA_201309</volume-id>
-+ </iso>
-+ <kernel>parabola/boot/x86_64/vmlinuz</kernel>
-+ <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
-+ </media>
-+ <media arch="i686">
-+ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
-+ <iso>
-+ <volume-id>PARA_201309</volume-id>
-+ </iso>
-+ <kernel>parabola/boot/i686/vmlinuz</kernel>
-+ <initrd>parabola/boot/i686/parabolaiso.img</initrd>
-+ </media>
-+ </os>
-+
-+</libosinfo>
-diff -ruN libosinfo-0.2.8-libre/po/POTFILES.in libosinfo-0.2.8-libre-free-distros/po/POTFILES.in
---- libosinfo-0.2.8-libre/po/POTFILES.in 2013-12-01 13:14:10.297130169 +0100
-+++ libosinfo-0.2.8-libre-free-distros/po/POTFILES.in 2013-12-01 13:23:01.616209485 +0100
-@@ -1,3 +1,4 @@
-+data/oses/parabola.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
diff --git a/pcr/libosinfo-libre/po.patch b/pcr/libosinfo-libre/po.patch
deleted file mode 100644
index abd11cb71..000000000
--- a/pcr/libosinfo-libre/po.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN libosinfo-0.2.8/po/POTFILES.in libosinfo-0.2.8-libre/po/POTFILES.in
---- libosinfo-0.2.8/po/POTFILES.in 2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/po/POTFILES.in 2013-12-01 11:54:50.441912252 +0100
-@@ -1,30 +1,9 @@
--data/oses/netware.xml.in
--data/oses/solaris.xml.in
--data/oses/dos.xml.in
--data/oses/mandrake.xml.in
--data/oses/mandriva.xml.in
--data/oses/suse.xml.in
--data/oses/gnome.xml.in
--data/oses/rhel.xml.in
--data/oses/fedora.xml.in
--data/oses/windows.xml.in
--data/oses/opensuse.xml.in
--data/oses/macos.xml.in
--data/oses/debian.xml.in
--data/oses/ubuntu.xml.in
--data/oses/centos.xml.in
--data/oses/openbsd.xml.in
--data/oses/freebsd.xml.in
--data/oses/rhl.xml.in
--data/oses/netbsd.xml.in
--data/oses/altlinux.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
- data/devices/qemu-usb.xml.in
- data/hypervisors/kvm.xml.in
- data/hypervisors/qemu.xml.in
--data/hypervisors/rhel-xen.xml.in
- data/hypervisors/xen.xml.in
- osinfo/osinfo_avatar_format.c
- osinfo/osinfo_deployment.c
diff --git a/pcr/libosinfo-libre/test.patch b/pcr/libosinfo-libre/test.patch
deleted file mode 100644
index 413deb1c0..000000000
--- a/pcr/libosinfo-libre/test.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN libosinfo-0.2.8/test/test-isodetect.c libosinfo-0.2.8-libre/test/test-isodetect.c
---- libosinfo-0.2.8/test/test-isodetect.c 2013-09-10 15:22:50.000000000 +0200
-+++ libosinfo-0.2.8-libre/test/test-isodetect.c 2013-12-01 11:44:32.830411240 +0100
-@@ -342,66 +342,6 @@
- g_object_unref(loader);
- }
-
--START_TEST(test_fedora)
--{
-- test_one("fedora");
--}
--END_TEST
--
--START_TEST(test_rhel)
--{
-- test_one("rhel");
--}
--END_TEST
--
--START_TEST(test_ubuntu)
--{
-- test_one("ubuntu");
--}
--END_TEST
--
--START_TEST(test_debian)
--{
-- test_one("debian");
--}
--END_TEST
--
--START_TEST(test_windows)
--{
-- test_one("windows");
--}
--END_TEST
--
--START_TEST(test_openbsd)
--{
-- test_one("openbsd");
--}
--END_TEST
--
--START_TEST(test_opensuse)
--{
-- test_one("opensuse");
--}
--END_TEST
--
--START_TEST(test_centos)
--{
-- test_one("centos");
--}
--END_TEST
--
--START_TEST(test_gnome)
--{
-- test_one("gnome");
--}
--END_TEST
--
--START_TEST(test_altlinux)
--{
-- test_one("altlinux");
--}
--END_TEST
--
- static Suite *
- list_suite(void)
- {
-@@ -409,16 +349,6 @@
- TCase *tc = tcase_create("Core");
- tcase_set_timeout(tc, 20);
-
-- tcase_add_test(tc, test_fedora);
-- tcase_add_test(tc, test_rhel);
-- tcase_add_test(tc, test_ubuntu);
-- tcase_add_test(tc, test_debian);
-- tcase_add_test(tc, test_windows);
-- tcase_add_test(tc, test_openbsd);
-- tcase_add_test(tc, test_opensuse);
-- tcase_add_test(tc, test_centos);
-- tcase_add_test(tc, test_gnome);
-- tcase_add_test(tc, test_altlinux);
- suite_add_tcase(s, tc);
- return s;
- }
diff --git a/pcr/lostfiles/PKGBUILD b/pcr/lostfiles/PKGBUILD
index acc8ddd64..413eb2ccf 100644
--- a/pcr/lostfiles/PKGBUILD
+++ b/pcr/lostfiles/PKGBUILD
@@ -1,7 +1,8 @@
# Contributor: graysky <graysky AT archlinux dot us>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
pkgname=lostfiles
-pkgver=3.07
+pkgver=3.10
pkgrel=1
pkgdesc='Find orphan files - those not owned by any Arch packages.'
arch=('any')
@@ -9,7 +10,7 @@ license=('GPL2')
depends=('bash')
url="https://github.com/graysky2/lostfiles"
source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('970d35a619043471067d58a6702443d5e7b9ab9ead96c37ae0811ecb11d2424d')
+sha256sums=('52cb37cb1214d9285fbba7dc774f1490eee0d3380d8f4f383406049e37c4fbc8')
package() {
cd "$pkgname-$pkgver"
diff --git a/pcr/md5deep/PKGBUILD b/pcr/md5deep/PKGBUILD
index fe1acb7bd..261bb9889 100755
--- a/pcr/md5deep/PKGBUILD
+++ b/pcr/md5deep/PKGBUILD
@@ -1,12 +1,13 @@
# Contributor: billycongo <billycongo@gmail.com>
# Maintainer: dkaylor <dpkaylor@gmail.com>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
pkgname=md5deep
-pkgver=4.3
-pkgrel=2
+pkgver=4.4
+pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="Advanced checksum hashing tool"
-url="http://md5deep.sourceforge.net"
+url="https://github.com/jessek/hashdeep"
license=('Public Domain')
# Copyright and license stuff:
@@ -22,24 +23,25 @@ license=('Public Domain')
# As such, md5deep exists in the public domain under 17 USC 105.
depends=('glibc')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-
-md5sums=('f172e686ca1df83a53308ad90f7f706d')
-sha1sums=('b9dd6444f07c9fc344ebef201baebdf71bda337f')
-sha256sums=('905bcf8bddf0e7e2650b280d5e7af8cb8cd41dad4f299751dfec397dcb4f8d54')
-sha512sums=('fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14')
-
+source=("https://github.com/jessek/hashdeep/archive/release-$pkgver.tar.gz")
+md5sums=('9ccfd5ba3e3d9cffddeb118cacad0c27')
+sha1sums=('cb4e313352974299c32bc55fe56396adb74517ef')
+sha256sums=('dbda8ab42a9c788d4566adcae980d022d8c3d52ee732f1cbfa126c551c8fcc46')
+sha512sums=('c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/hashdeep-release-$pkgver"
+
+ sh ./bootstrap.sh
./configure --prefix=/usr
+
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/hashdeep-release-$pkgver"
make DESTDIR=$pkgdir install
}
diff --git a/pcr/multipath-tools-git/PKGBUILD b/pcr/multipath-tools-git/PKGBUILD
deleted file mode 100644
index d1bb4ac9b..000000000
--- a/pcr/multipath-tools-git/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Miguel Revilla <yo@miguelrevilla.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Timothée Ravier <tim@siosm.fr>
-
-pkgname=multipath-tools-git
-pkgver=1295.81895af
-pkgrel=1
-pkgdesc="Tools to drive the Device Mapper multipathing driver (contains kpartx)"
-url="http://christophe.varoqui.free.fr/"
-arch=('x86_64' 'i686')
-license=('GPL2')
-depends=('libaio' 'device-mapper')
-makedepends=('git' 'setconf')
-options=(!emptydirs)
-source=("${pkgname}::git+http://git.opensvc.com/multipath-tools/.git")
-md5sums=('SKIP')
-
-pkgver() {
- cd ${pkgname}
- echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-prepare() {
- cd ${pkgname}
- sed -i 's|/sbin|/usr/bin|g' Makefile.inc
- sed -i 's|LIB=lib|LIB=usr/lib|g' Makefile.inc
- sed -i 's|${prefix}/lib/udev|${prefix}/usr/lib/udev|g' Makefile.inc
- sed -i 's|$(prefix)/lib/systemd/system|$(prefix)/usr/lib/systemd/system|g' Makefile.inc
-}
-
-build() {
- cd ${pkgname}
- setconf Makefile.inc GZIP '/usr/bin/gzip -9 -c'
- make
-}
-
-package() {
- cd ${pkgname}
- make LIB="/usr/lib" DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
- cd "${pkgdir}"/usr/lib
- rm libmpathpersist.so
- ln -s libmpathpersist.so.0 libmpathpersist.so
-}
diff --git a/pcr/multipath-tools/PKGBUILD b/pcr/multipath-tools/PKGBUILD
new file mode 100644
index 000000000..b497d0f60
--- /dev/null
+++ b/pcr/multipath-tools/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Justin Dray <justin@dray.be>
+# Contributor: Patrick McCarty <pnorcks at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
+# Contributor: Michael P <ptchinster@archlinux.us>
+# Contributor: Matt Heagney <matt@heagney.com>
+
+pkgname=multipath-tools
+pkgver=0.5.0
+pkgrel=1
+pkgdesc='Multipath tools for Linux (including kpartx)'
+arch=('i686' 'x86_64')
+url="http://christophe.varoqui.free.fr/"
+license=('GPL2')
+depends=('libaio' 'device-mapper')
+conflicts=('multipath-tools-git')
+backup=('etc/multipath.conf')
+install=multipath-tools.install
+options=(!emptydirs)
+source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2
+ buffer-overflows.patch
+ blacklist-cciss-devices.patch)
+md5sums=('faf261d4cc717bf4c979557dc7bf5f52'
+ '869942bdd31decc696f9cf4af24df65b'
+ 'c81422ccf5fd5ca6208dfbdd66ff323c')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/buffer-overflows.patch"
+ patch -Np1 -i "${srcdir}/blacklist-cciss-devices.patch"
+
+ sed -i 's|/etc/udev/rules.d|/usr/lib/udev|g' Makefile.inc kpartx/Makefile kpartx/kpartx.rules
+ sed -i 's|${prefix}/lib/udev|${prefix}/usr/lib/udev|g' Makefile.inc
+ sed -i 's|/sbin|/usr/bin|g' Makefile.inc multipathd/multipathd.service
+ sed -i '/Before/d' multipathd/multipathd.service
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make LIB="/usr/lib" \
+ DESTDIR="${pkgdir}" \
+ install
+
+ install -d "${pkgdir}/usr/share/multipath/examples"
+ install -Dm644 "multipath.conf.annotated" "${pkgdir}/usr/share/multipath/examples/multipath.conf.annotated"
+ install -Dm644 "multipath.conf.defaults" "${pkgdir}/usr/share/multipath/examples/multipath.conf.defaults"
+ install -Dm644 "multipath.conf.synthetic" "${pkgdir}/usr/share/multipath/examples/multipath.conf.synthetic"
+ install -Dm644 "multipath.conf.defaults" "${pkgdir}/etc/multipath.conf"
+ rm "${pkgdir}/usr/lib/libmpathpersist.so"
+ ln -s "${pkgdir}/usr/lib/libmpathpersist.so.0" "libmpathpersist.so"
+}
diff --git a/pcr/multipath-tools/blacklist-cciss-devices.patch b/pcr/multipath-tools/blacklist-cciss-devices.patch
new file mode 100644
index 000000000..30a4400a7
--- /dev/null
+++ b/pcr/multipath-tools/blacklist-cciss-devices.patch
@@ -0,0 +1,30 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Fri, 3 Oct 2008 12:39:48 +0200
+Subject: [PATCH] blacklist cciss devices
+
+cciss support isn't complete in 0.4.8 and the half functioning causes
+problems in d-i among other things.
+Closes: #500991
+---
+ libmultipath/blacklist.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+
+diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
+index 79ddcde..6d0a0ad 100644
+--- a/libmultipath/blacklist.c
++++ b/libmultipath/blacklist.c
+@@ -182,6 +182,13 @@ setup_default_blist (struct config * conf)
+ if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT))
+ return 1;
+
++ str = STRDUP("^cciss!c[0-9]d[0-9]*");
++ if (!str)
++ return 1;
++ if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
++ return 1;
++
++
+ vector_foreach_slot (conf->hwtable, hwe, i) {
+ if (hwe->bl_product) {
+ if (_blacklist_device(conf->blist_device, hwe->vendor, \ No newline at end of file
diff --git a/pcr/multipath-tools/buffer-overflows.patch b/pcr/multipath-tools/buffer-overflows.patch
new file mode 100644
index 000000000..7d84ea91c
--- /dev/null
+++ b/pcr/multipath-tools/buffer-overflows.patch
@@ -0,0 +1,13 @@
+diff --git a/libmultipath/prioritizers/hds.c b/libmultipath/prioritizers/hds.c
+index f748707..1cec8a7 100644
+--- a/libmultipath/prioritizers/hds.c
++++ b/libmultipath/prioritizers/hds.c
+@@ -125,7 +125,7 @@ int hds_modular_prio (const char *dev, int fd)
+ return -1;
+ }
+
+- snprintf (vendor, 9, "%.8s", inqBuffp + 8);
++ snprintf (vendor, 8, "%.8s", inqBuffp + 8);
+ snprintf (product, 17, "%.16s", inqBuffp + 16);
+ snprintf (serial, 5, "%.4s", inqBuffp + 40);
+ snprintf (ldev, 5, "%.4s", inqBuffp + 44); \ No newline at end of file
diff --git a/pcr/multipath-tools/multipath-tools.install b/pcr/multipath-tools/multipath-tools.install
new file mode 100644
index 000000000..8ef2efaca
--- /dev/null
+++ b/pcr/multipath-tools/multipath-tools.install
@@ -0,0 +1,9 @@
+post_install() {
+
+ cat <<-EOF
+ * For full functonality ensure that the dm_multipath kernel module is loaded"
+ * Make sure to create /etc/multipath.conf based off of the defaults found in
+ /usr/share/multipath/examples
+ EOF
+
+}
diff --git a/pcr/python2-polib/PKGBUILD b/pcr/python2-polib/PKGBUILD
deleted file mode 100644
index 50047ac3e..000000000
--- a/pcr/python2-polib/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Esteban V. Carnevale <alfplayer@mailoo.com>
-
-pkgname=python2-polib
-_pkgname='polib'
-pkgver=1.0.3
-pkgrel=1
-pkgdesc='A library to manipulate gettext files'
-url='http://polib.readthedocs.org/en/latest/index.html'
-arch=('any')
-license=('MIT')
-depends=('python2')
-
-source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz")
-md5sums=('dc9dc39d4053cfe030155891f3043cb1')
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- python2 setup.py install --root="${pkgdir}" --optimize=1
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
index 36bfeb18e..f52c614c5 100644
--- a/pcr/retroshare/PKGBUILD
+++ b/pcr/retroshare/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: funkyou
# Set this to true to build and install retroshare-nogui
-_build_nogui=false
+_build_nogui=true
# Set this to true to build and install the plugins
_build_linkscloud=true
@@ -14,20 +14,21 @@ _build_voip=true
### Nothing to be changed below this line ###
pkgname=retroshare
-pkgver=0.5.4e
-pkgrel=3
+pkgver=0.5.5c
+pkgsvn=0.7068
+pkgrel=2
pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'mips64el')
url="http://retroshare.sourceforge.net/"
license=('LGPL' 'GPL')
depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
install="${pkgname}.install"
-source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/${pkgname}_${pkgver::5}-${pkgsvn}.tar.gz \
${pkgname}.install \
${pkgname}.desktop)
-sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
+sha256sums=('772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650'
'4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
'70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
@@ -36,8 +37,10 @@ sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
+_rssrcdir="${pkgname}-${pkgver::5}/src"
+
build() {
- local _srcdir="${srcdir}/retroshare-0.5.4/src"
+ local _srcdir="${srcdir}/$_rssrcdir"
local _qmake='qmake-qt4'
msg "Compiling OpenPGP-SDK..."
@@ -63,7 +66,7 @@ build() {
if [[ "$_build_voip" == "true" ]] ; then
msg "Compiling VOIP plugin..."
cd "${_srcdir}/plugins/VOIP"
- sed -i 's/lessThan.*/true {/' VOIP.pro
+ #sed -i 's/lessThan.*/true {/' VOIP.pro
$_qmake
make
fi
@@ -87,14 +90,14 @@ build() {
cd "${_srcdir}/rsctrl/src"
make
cd "${_srcdir}/retroshare-nogui/src"
- sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
+ #sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
$_qmake
make
fi
}
package() {
- local _srcdir="${srcdir}/retroshare-0.5.4/src"
+ local _srcdir="${srcdir}/$_rssrcdir"
# --- Install Files ---
@@ -144,5 +147,5 @@ package() {
# Skins
cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
- find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
+ #find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
}
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 392fc5850..ee50d998a 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -2,22 +2,24 @@
# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
pkgname='ryzom-hg'
-hgver=923522b
-pkgver=20131215
-pkgrel=3
+hgver=e7f0b9c
+pkgver=20140328
+pkgrel=1
pkgdesc="An awesome free software 3D MMORPG game"
arch=('i686' 'x86_64')
url="http://www.ryzom.com/"
license=('AGPL3')
#depends=('nel-hg' 'ryzom-data' 'lua51') # use these when https://bitbucket.org/ryzom/ryzomcore/issue/149 is solved
-depends=('libpng' 'libjpeg' 'libwww-hg' 'boost' 'freetype2' 'luabind' 'libogg' 'libvorbis' 'openal' 'mesa' 'glu' 'lua51' 'ryzom-data')
+depends=('libpng' 'libjpeg' 'libwww-hg' 'boost' 'freetype2' 'luabind' 'libogg' 'libvorbis'
+ 'openal' 'mesa' 'glu' 'lua51' 'ryzom-data')
#conflicts=('ryzom' 'ryzom-client') # see above
conflicts=('ryzom' 'ryzom-client' 'nel-hg' 'ryzom-nel')
makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'boost' 'rrdtool')
source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('ad05f08004a80758a13566061ce29edfe4803c0c62e30190c437c781038c254e')
+sha256sums=('fce7d94f1c55afd939ab4943af6480b0d20d4f74f5d357029777f84ac661f869')
mksource=("$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${hgver}")
+mkdepends=('mercurial')
mksource() {
cd "$srcdir/$pkgname-$pkgver/"
@@ -25,7 +27,7 @@ mksource() {
cd "$srcdir/$pkgname-$pkgver/code/"
mv * ../
rm -rf "$srcdir/$pkgname-$pkgver/code/"
- sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${srcpkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
+ #sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${srcpkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
}
build() {
diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD
index 2902f07bc..1217fa8a9 100644
--- a/pcr/tomb/PKGBUILD
+++ b/pcr/tomb/PKGBUILD
@@ -2,24 +2,27 @@
# Maintainer: nignux <nignux@freaknet.org>
# Maintainer (Parabola): fauno <fauno@parabola.nu>
# Contributor: BoySka
+# Contributor: Rich Li
-pkgbase=tomb
pkgname=(tomb tomb-kdf)
-pkgver=1.4
-pkgrel=2
+pkgver=1.5.2
+pkgrel=1
pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.dyne.org/software/tomb/"
license=('GPL3')
install=${pkgname}.install
-source=(https://files.dyne.org/.xsend.php?file=tomb/releases/Tomb-1.4.tar.gz https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz.sha{,.asc})
+source=(https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz
+ https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz.sha
+ https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz.sha.asc
+ )
# The first hash comes from the .sha file
-sha256sums=('2621ac6b9180321e69743dc899645449b2b958c6aa46e4b2601c2e89131bbf29'
+sha256sums=('6ae28aaec7b533127534070b25ccba08eb1416dc07e7e74bf433f5c5d675f7e2'
'SKIP'
'SKIP')
build() {
- cd ${srcdir}/Tomb-${pkgver}/extras/kdf
+ cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys
make
}
@@ -46,6 +49,6 @@ package_tomb-kdf() {
pkgdesc="Crypto Undertaker extensions to improve password security"
depends=('libgcrypt')
- cd ${srcdir}/Tomb-${pkgver}/extras/kdf
+ cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys
make DESTDIR=${pkgdir} PREFIX=/usr install
}
diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD
index b9e8fc537..c4c7abdc9 100644
--- a/pcr/twinkle/PKGBUILD
+++ b/pcr/twinkle/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=twinkle
pkgver=1.4.2
-pkgrel=20
+pkgrel=21
pkgdesc="Softphone for voice over IP and IM communication using SIP"
arch=('x86_64' 'i686')
url="http://www.twinklephone.com/"
@@ -30,7 +30,7 @@ build() {
automake -a
export QTDIR=/usr/lib/qt3
export PATH=$QTDIR/bin:$PATH
- CPPFLAGS="$CPPFLAGS -I/usr/include/qt3" \
+ CPPFLAGS="$CPPFLAGS -I/usr/include/qt3 -I/usr/include/libzrtpcpp/" \
./configure --prefix=/usr \
--without-kde \
--with-speex \
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 1e2cc344c..f2dc2ac05 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=youtube-dl-current
_pkgname=youtube-dl
provides=(youtube-dl)
-pkgver=2014.04.11.2
+pkgver=2014.04.21.6
pkgrel=1
pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
arch=('any')
@@ -28,5 +28,5 @@ package() {
"${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
}
-md5sums=('12c5d1af893c7f5ff782ccb84347573b'
+md5sums=('6521af6c7a419ade8d271aad3a3648df'
'SKIP')