summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-06-24 23:06:35 +0000
committerroot <root@rshg047.dnsready.net>2011-06-24 23:06:35 +0000
commit71f58605e914de11f3a9b7cc2f27b0c52fb8d4ba (patch)
tree948002f901215fa91b99058ec3bfc4a51475018d /libre
parent7347bb994a41d021c83e97b503f577f2399302e7 (diff)
Fri Jun 24 23:06:35 UTC 2011
Diffstat (limited to 'libre')
-rw-r--r--libre/kernel26-libre-lts/PKGBUILD8
-rw-r--r--libre/kernel26-libre-lts/config30
-rw-r--r--libre/kernel26-libre-lts/config.x86_6430
-rw-r--r--libre/kernel26-libre-lts/kernel26-libre-lts.install4
-rw-r--r--libre/kernel26-libre/PKGBUILD11
-rw-r--r--libre/kernel26-libre/config.i68623
-rw-r--r--libre/kernel26-libre/config.x86_6423
-rw-r--r--libre/kernel26-libre/kernel26.install4
-rw-r--r--libre/liferea-libre/PKGBUILD56
-rw-r--r--libre/liferea-libre/libnotify-0.7.patch21
-rw-r--r--libre/liferea-libre/liferea.install21
-rw-r--r--libre/liferea-libre/remove-non-free-suggestions.patch31
-rw-r--r--libre/mplayer-libre/PKGBUILD12
13 files changed, 214 insertions, 60 deletions
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index 63d0d83da..acbdde5ad 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
_kernelname=${pkgname#kernel26-libre}
_basekernel=2.6.32
_preset=kernel26-lts.preset
-pkgver=${_basekernel}.41
+pkgver=${_basekernel}.42
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -211,8 +211,8 @@ package_kernel26-libre-lts-headers() {
# remove unneeded architectures
rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
}
-md5sums=('759ac16149fea3bca10a2d723c03e53a'
+md5sums=('4344dc9016b73a4910566e4a45087465'
'3298f542840c52a8b8abc1b3795e455b'
- 'e9fd751f4e7c4bbce027aa83ea90202d'
+ '9990806b3bf3cec6f8bd419249903613'
'2cbfeb3e2a18d45f82f613e97fc23355'
- 'fbfc7a1af3208c7b729055d91e1c149a')
+ 'a03a56a3cd700f0c9004b17e7391f8ff')
diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config
index fcf978f36..c538b3196 100644
--- a/libre/kernel26-libre-lts/config
+++ b/libre/kernel26-libre-lts/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Mon Apr 18 12:31:05 2011
+# Tue Jun 7 06:41:37 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -4517,6 +4517,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -4524,7 +4525,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
@@ -4532,24 +4535,28 @@ CONFIG_TRACING=y
CONFIG_GENERIC_TRACER=y
CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SYSPROF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_BOOT_TRACER is not set
+CONFIG_SYSPROF_TRACER=y
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_BOOT_TRACER=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_POWER_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
+CONFIG_POWER_TRACER=y
+CONFIG_STACK_TRACER=y
+CONFIG_KMEMTRACE=y
+CONFIG_WORKQUEUE_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -4558,7 +4565,6 @@ CONFIG_MMIOTRACE=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64
index 2202caeeb..5f7e05284 100644
--- a/libre/kernel26-libre-lts/config.x86_64
+++ b/libre/kernel26-libre-lts/config.x86_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Tue May 10 08:27:04 2011
+# Tue Jun 7 08:38:42 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -4328,6 +4328,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -4335,7 +4336,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
@@ -4343,24 +4346,28 @@ CONFIG_TRACING=y
CONFIG_GENERIC_TRACER=y
CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SYSPROF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_BOOT_TRACER is not set
+CONFIG_SYSPROF_TRACER=y
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_BOOT_TRACER=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_POWER_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
+CONFIG_POWER_TRACER=y
+CONFIG_STACK_TRACER=y
+CONFIG_KMEMTRACE=y
+CONFIG_WORKQUEUE_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -4369,7 +4376,6 @@ CONFIG_MMIOTRACE=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install
index c3249445a..8bc94634d 100644
--- a/libre/kernel26-libre-lts/kernel26-libre-lts.install
+++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install
@@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.32-lts
post_install () {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION
+ /sbin/depmod $KERNEL_VERSION
# generate init ramdisks
echo ">>> MKINITCPIO SETUP"
echo ">>> ----------------"
@@ -84,7 +84,7 @@ post_upgrade() {
fi
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION
+ /sbin/depmod $KERNEL_VERSION
echo ">>> MKINITCPIO SETUP"
echo ">>> ----------------"
if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 736bb1c9b..621a30245 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -9,8 +9,7 @@ _basekernel=2.6.39
pkgver=${_basekernel}.1
pkgrel=1
makedepends=('xmlto' 'docbook-xsl')
-#_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
-_patchname="patch-2.6.39-1-LIBRE"
+_patchname="patch-${pkgver}-${pkgrel}-LIBRE"
arch=(i686 x86_64)
license=('GPL2')
url="http://linux-libre.fsfla.org/"
@@ -241,8 +240,8 @@ find $pkgdir -type d -exec chmod 755 {} \;
rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
}
md5sums=('923210b0c4190733bf314e48f588c112'
- 'abad63eab1f9485f6b1af76f5109f1e4'
- '5d40a23419b48f5b49f1f10be0e733c3'
- 'af5937ac06a78907ceb499351bdff7ab'
+ '252cbddfd9a8bb97181c087fdd5e2377'
+ 'd5c6c675662d98011513f6cbc81d66db'
+ '00e8553b44dac65fc093db60a1cde842'
'25584700a0a679542929c4bed31433b6'
- 'ba583747f515e51ec0f16d535e4be6e0')
+ 'fdfed5e8b46f289617ee6def01978090')
diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index 0d9636f62..e31c29f87 100644
--- a/libre/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/i386 2.6.39 Kernel Configuration
-# Thu May 19 19:49:50 2011
+# Mon Jun 6 20:12:12 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1094,7 +1094,8 @@ CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -5417,6 +5418,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5425,7 +5427,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5434,20 +5438,24 @@ CONFIG_TRACING=y
CONFIG_GENERIC_TRACER=y
CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -5458,7 +5466,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
CONFIG_TEST_KSTRTOX=m
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index 5f6e24386..a373f420b 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 2.6.39 Kernel Configuration
-# Thu May 19 21:49:53 2011
+# Mon Jun 6 22:07:19 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1061,7 +1061,8 @@ CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -5161,6 +5162,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5169,7 +5171,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5178,20 +5182,24 @@ CONFIG_TRACING=y
CONFIG_GENERIC_TRACER=y
CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -5202,7 +5210,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
CONFIG_TEST_KSTRTOX=m
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
diff --git a/libre/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install
index 0a7bc7772..8c0c80c85 100644
--- a/libre/kernel26-libre/kernel26.install
+++ b/libre/kernel26-libre/kernel26.install
@@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.39-LIBRE
post_install () {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION
+ /sbin/depmod $KERNEL_VERSION
# generate init ramdisks
echo ">>> MKINITCPIO SETUP"
echo ">>> ----------------"
@@ -84,7 +84,7 @@ post_upgrade() {
fi
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION
+ /sbin/depmod $KERNEL_VERSION
echo ">>> MKINITCPIO SETUP"
echo ">>> ----------------"
if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
new file mode 100644
index 000000000..044663626
--- /dev/null
+++ b/libre/liferea-libre/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Eric BĂ©langer <eric@archlinux.org>
+# Contributor: bitlord
+
+pkgbasename=liferea
+pkgname=liferea-libre
+pkgver=1.6.5
+pkgrel=3
+pkgdesc="A desktop news aggregator for online news feeds and weblogs"
+arch=('i686' 'x86_64')
+url="http://liferea.sourceforge.net/"
+provides=("liferea=$pkgver")
+replaces=('liferea')
+conflicts=('liferea')
+license=('GPL')
+depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
+makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
+optdepends=('lua: for lua scripting support'
+ 'libnotify: for notification support')
+options=('!libtool' '!emptydirs')
+install=liferea.install
+source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz
+ libnotify-0.7.patch
+ remove-non-free-suggestions.patch)
+md5sums=('f2d0ae5fb9f763451ba8b9fe2216de9c'
+ 'fca97e3316c1c51e0179c4c7dcce47a2'
+ '380284dc0b54ab9488f0659e832e59fa')
+
+# source PKGBUILD ; mksource
+mksource() {
+ wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \
+ -O - | tar xzf -
+
+ pushd liferea-$pkgver >/dev/null
+ patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1
+ popd >/dev/null
+
+ tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/
+ rm -rvf liferea-$pkgver/
+}
+
+build() {
+ cd "${srcdir}/liferea-${pkgver}"
+ patch -Np1 -i "$srcdir/libnotify-0.7.patch"
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
+ make
+}
+
+package() {
+ cd "${srcdir}/liferea-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
+ rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch
new file mode 100644
index 000000000..6dbbffb87
--- /dev/null
+++ b/libre/liferea-libre/libnotify-0.7.patch
@@ -0,0 +1,21 @@
+diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c
+--- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000 +0200
++++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06 23:53:45.783336455 +0100
+@@ -150,7 +150,7 @@
+ // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
+ // notify_notification_clear_actions(n);
+
+- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
++ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL);
+
+ notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
+
+@@ -244,7 +244,7 @@
+
+ labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count),
+ node_get_title (node), item_count);
+- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
+ g_free(labelSummary_p);
+
+ notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
new file mode 100644
index 000000000..369a55727
--- /dev/null
+++ b/libre/liferea-libre/liferea.install
@@ -0,0 +1,21 @@
+pkgname=liferea-libre
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
new file mode 100644
index 000000000..0230fdb78
--- /dev/null
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -0,0 +1,31 @@
+--- liferea-1.6.5/src/ui/ui_prefs.c_orig 2011-06-23 01:33:39.761555322 +0200
++++ liferea-1.6.5/src/ui/ui_prefs.c 2011-06-23 01:38:02.121556890 +0200
+@@ -76,24 +76,10 @@
+ NULL, NULL
+ },
+ {
+- /* tested with SeaMonkey 1.0.6 */
+- "mozilla", "Mozilla", "mozilla %s",
+- NULL, "mozilla -remote openURL(%s)",
+- NULL, "mozilla -remote 'openURL(%s,new-window)'",
+- NULL, "mozilla -remote 'openURL(%s,new-tab)'"
+- },
+- {
+- /* tested with Firefox 1.5 and 2.0 */
+- "firefox", "Firefox","firefox \"%s\"",
+- NULL, "firefox -a firefox -remote \"openURL(%s)\"",
+- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'",
+- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'"
+- },
+- {
+- "opera", "Opera","opera \"%s\"",
+- "opera \"%s\"", "opera -remote \"openURL(%s)\"",
+- "opera -newwindow \"%s\"", NULL,
+- "opera -newpage \"%s\"", NULL
++ "icecat", "IceCat","icecat \"%s\"",
++ NULL, "icecat -a icecat -remote \"openURL(%s)\"",
++ NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'",
++ NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'"
+ },
+ {
+ "epiphany", "Epiphany","epiphany \"%s\"",
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index c3b4a0830..36fcc4aae 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -6,10 +6,10 @@ _pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=33690
-pkgrel=1
+pkgrel=2
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'
+'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')
license=('GPL')
url="http://www.mplayerhq.hu/"
@@ -26,7 +26,7 @@ build() {
--disable-gui \
--disable-arts \
--disable-liblzo \
- --disable-speex \
+ --enable-speex \
--disable-openal \
--disable-libdv \
--disable-musepack \
@@ -44,8 +44,8 @@ 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'
- 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+ 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')
provides=("mplayer=$pkgver")
replaces=('mplayer')
@@ -65,7 +65,7 @@ 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'
+ 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')
provides=("mencoder=$pkgver")
replaces=('mencoder')