summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Silva <marcio@pc-02.localdomain>2012-06-08 17:13:55 -0300
committerMárcio Silva <marcio@pc-02.localdomain>2012-06-08 17:13:55 -0300
commit1b5bde5448c7eeec91c9e2b15e91f6cf26f24601 (patch)
tree801be2e4aaff9d57930b544a7a308fac63c5cc38
parent21c0554290cb194d7b00e645a2fbf1b28f92f758 (diff)
parent1063a1e2f30d9fa3a6373e2f73887d2dbc0b946e (diff)
downloadabslibre-1b5bde5448c7eeec91c9e2b15e91f6cf26f24601.tar.gz
abslibre-1b5bde5448c7eeec91c9e2b15e91f6cf26f24601.tar.bz2
abslibre-1b5bde5448c7eeec91c9e2b15e91f6cf26f24601.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--kernels/linux-libre-rt/PKGBUILD15
-rw-r--r--kernels/linux-libre-rt/config.i6867
-rw-r--r--kernels/linux-libre-rt/config.x86_647
-rw-r--r--kernels/linux-libre-rt/linux-libre-rt.install12
-rw-r--r--libre/apache-ant/PKGBUILD12
-rw-r--r--libre/apache-ant/apache-ant.csh3
-rw-r--r--libre/iceape-i18n/PKGBUILD50
-rw-r--r--libre/iceape-libre/PKGBUILD8
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD8
-rw-r--r--libre/kdelibs-libre/PKGBUILD10
-rw-r--r--libre/kdelibs-libre/use-pythondontwritebytecode.patch8
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD15
-rw-r--r--libre/kdenetwork-kopete-libre/gcc47.patch59
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD6
-rw-r--r--libre/linux-libre-api-headers/PKGBUILD8
-rw-r--r--libre/your-freedom/PKGBUILD5
16 files changed, 79 insertions, 154 deletions
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 7c4870f1a..9c07ee16c 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -13,8 +13,8 @@ pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-RT
_basekernel=3.2
-_releasever=16
-_rtpatchver=rt27
+_releasever=19
+_rtpatchver=rt30
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
pkgrel=1
@@ -35,10 +35,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'i915-fix-ghost-tv-output.patch'
'ext4-options.patch')
md5sums=('65c669b6e4888db84a80882461851867'
- '88427253e35474302c40ab1d4843a9aa'
- 'f003895eb0231f829f74f93921568d53'
- '6141ab0cb60a5cf9e6ee3bdf8c8c79b1'
- 'c2f3423d7c7d8e5776e961b75a52a3fc'
+ '87d9a426bda3bdc58fcb5f002c459adb'
+ 'bb7b98d1186edd0544cefc7499d3740b'
+ '824bb5f926d00d499f3a2a68f06d9760'
+ '84d96cded290680ec2b875e2223deff9'
'82496e68851d1960543a07ba51cdb44a'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
@@ -53,7 +53,7 @@ build() {
fi
# add realtime patch
- patch -Np1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch"
+ patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch"
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
@@ -67,6 +67,7 @@ build() {
# needed.
patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
+ # Patch submitted upstream, waiting for inclusion:
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index 749ad1e09..7ae7c1d78 100644
--- a/kernels/linux-libre-rt/config.i686
+++ b/kernels/linux-libre-rt/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.2 Kernel Configuration
+# Linux/i386 3.2.18 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -106,7 +106,6 @@ CONFIG_SPARSE_IRQ=y
#
# RCU Subsystem
#
-# CONFIG_TREE_RCU is not set
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
@@ -186,7 +185,6 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
-# CONFIG_SLUB is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_HAVE_OPROFILE=y
@@ -419,8 +417,6 @@ CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_CLEANCACHE=y
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -5048,7 +5044,6 @@ CONFIG_R8187SE=m
CONFIG_RTL8192U=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_R8712_AP=y
CONFIG_RTS_PSTOR=m
# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64
index 13386d7f3..57f66119a 100644
--- a/kernels/linux-libre-rt/config.x86_64
+++ b/kernels/linux-libre-rt/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.2 Kernel Configuration
+# Linux/x86_64 3.2.18 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -108,7 +108,6 @@ CONFIG_SPARSE_IRQ=y
#
# RCU Subsystem
#
-# CONFIG_TREE_RCU is not set
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
@@ -188,7 +187,6 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
-# CONFIG_SLUB is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_HAVE_OPROFILE=y
@@ -405,8 +403,6 @@ CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_CLEANCACHE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -4809,7 +4805,6 @@ CONFIG_R8187SE=m
CONFIG_RTL8192U=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_R8712_AP=y
CONFIG_RTS_PSTOR=m
# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 5f73fb8fb..407bf32c1 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-rt
-KERNEL_VERSION=3.2.16-1-rt27-LIBRE-RT
+KERNEL_VERSION=3.2.19-1-rt30-LIBRE-RT
post_install () {
# updating module dependencies
@@ -28,7 +28,7 @@ post_install () {
post_upgrade() {
pacman -Q grub &>/dev/null
hasgrub=$?
- pacman -Q grub2 &>/dev/null
+ pacman -Q grub2-common &>/dev/null
hasgrub2=$?
pacman -Q lilo &>/dev/null
haslilo=$?
@@ -44,12 +44,8 @@ post_upgrade() {
echo ">>>"
fi
- if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
- if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
- echo "WARNING: /boot appears to be a seperate partition but is not mounted"
- echo " This is most likely not what you want. Please mount your /boot"
- echo " partition and reinstall the kernel unless you are sure this is OK"
- fi
+ if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
+ echo "WARNING: /boot appears to be a separate partition but is not mounted."
fi
# updating module dependencies
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index b6b429442..77e0dfe94 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -3,13 +3,13 @@
# Contributor: Andrew Wright <andreww@photism.org>
pkgname=apache-ant
-pkgver=1.8.2
+pkgver=1.8.4
provides=("apache-ant-libre=$pkgver")
replaces=("apache-ant-libre")
conflicts=("apache-ant-libre")
-pkgrel=4.2
+pkgrel=1.1
pkgdesc="A Java-based build tool"
arch=('any')
license=('Apache')
@@ -64,12 +64,14 @@ build() {
ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
done
# Build
+ source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var
sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
}
package() {
cd "${srcdir}"/${pkgname}-${pkgver}-bin
- source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
+ source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
+ source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var
## Install profile.d script
install -d "${pkgdir}"/etc/profile.d
@@ -103,6 +105,6 @@ package() {
ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
}
-md5sums=('0d9e108afcd15b820150b8085c96d2b1'
+md5sums=('c474fa9d0c35a24037c23b6e476862c1'
'bd63c881be406f515fc4d22635e8326a'
- '298e8ba2e99ccda7706113ea37e030f2')
+ 'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
index 490a17b65..fdc04b2f8 100644
--- a/libre/apache-ant/apache-ant.csh
+++ b/libre/apache-ant/apache-ant.csh
@@ -1,3 +1,2 @@
#!/bin/csh
-setenv ANT_HOME /usr/share/java/apache-ant
-setenv PATH ${PATH}:${ANT_HOME}/bin
+setenv ANT_HOME /opt/apache-ant
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 3c0b42b31..5f4db3101 100644
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -10,8 +10,8 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceape
-_debver=2.7.4
-_debrel=2
+_debver=2.7.5
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -21,7 +21,7 @@ pkgbase=iceape-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=2.7.4
+_pkgver=2.7.5
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -57,25 +57,25 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('6d773ee12e9e3475f20f7ae1a13ae60b'
- 'cce134a647f71808c15d3a693c6e0d91'
- '289b5df66a7bf79a900f7033f034b941'
- '90f7836b6dbe752fe0eb6e85be961dad'
- '46f6170f7ca9a0e7d1be7cf2da411089'
- '16fcf9e6c74a25ec164e4d0d9be7a9d4'
- 'ad7eb7ff8ec821d3bb8baedb4c83b9a1'
- '612ed06337160596629f92699bc9dc08'
- '8204487072c23d70c1332c32b75850f1'
- 'd653627ccc8f188d8f908ad60ee9c10d'
- '146e7bb6829b44c9b971d271a9682f47'
- 'eed45ddcec761bb76eec33ca26b8f869'
- '0fb90f7c8de00ddcf7dc500264979cba'
- '3454cfd4e79a7a2ef2a519133f57a5a7'
- '880b81a89f71851f146e3e8bb45c0215'
- 'e219a4a6a277edf7da1ecaf29203887f'
- '9dff81762577df8b105912457a8ebdcd'
- 'a7431be429fc93dc9876e3376441855b'
- '19cb8a522fc38aeabdf375c2118efe7a'
- '7d1e1f279bf3786917b11168251ced57'
- '918022ba06904a99caffa5654a47f8b3'
- '138d693f00d34ed8f943fca053e9e876')
+md5sums=('03a75ce1325fc748d0943cd39659e8ca'
+ '9fc2070dc6db8d94f322cb5e27523ea4'
+ '6cb55fe51fca1de674ca32b10edc7c8b'
+ '138121b288c269aa418ca0c33eb65326'
+ '8fd47eed7c79fe29c74a81d9b4a4864a'
+ 'f253842c0a377e86c6c62f7db27db32d'
+ 'b93caebe5ceb08d2cde78fe40fff3c0c'
+ 'a36d0776b736609b1e72b8530cc9e755'
+ '9acd2d8e4fd39700aa99a21681403a72'
+ '60703c83180e8bb3abdcfbf26bf1289d'
+ 'dc708663d015830fb11e800f48d7492c'
+ '313e6a88a602e09b5f08d6ff8ccdc89a'
+ '31debae1dca6035695805d0de55c71f3'
+ '1f927d23eb1db49db3ffe2d3ee5e3da5'
+ '4b5e52235ce8a52d1144d5f6e45a069c'
+ '81d1a28544f9a6e92eafc48e57a45a35'
+ 'bb32f5938b885d2de225e4d8e2471d28'
+ '69d447db48244cc1546d0ce3447e8ab8'
+ '16d36a140dfbd9a001b28f4fcbc81df8'
+ '211bb03760a2eacf685f27f03e71da4d'
+ '83225015ad8f023ff0d9f9643c295e4c'
+ '67d3ec1632a4ed2aaf8e7a5df0284b1e')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 9099fb270..a2e3ed362 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,8 +3,8 @@
# We're getting this from Debian Sid
_debname=iceape
-_debver=2.7.4
-_debrel=2
+_debver=2.7.5
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
${_pkgname}-2.0-lang.patch
clrf.patch
libre.patch)
-md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138'
- '4519446d9f23885dd748a59dfbbfa0a4'
+md5sums=('7a6e671485a75cd9495f346e0f8e4dcb'
+ '174e572e9d7b1b62a8e437f70fe771ba'
'60ba9e8f2fafd20e41268af534a55ea7'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 9c1223d07..550ad4b3f 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158148 2012-05-03 13:20:53Z andrea $
+# $Id: PKGBUILD 160829 2012-06-06 16:14:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,8 +6,8 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.8.3
-pkgrel=1.3
+pkgver=4.8.4
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
license=('GPL' 'LGPL' 'FDL')
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
"konq-about-fsdg.diff")
-sha1sums=('593053e7fdd50b32e6f9264edf2a69e499ddc0a6'
+sha1sums=('a1d6951b27c868c738a36dbd21702b658f3d6245'
'f41541371414dcbe5e76687835e648112b3ff364')
pkgdesc='KDE File Manager & Web Browser'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 9799d2b5e..0ddf606ec 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160657 2012-06-03 10:02:50Z andrea $
+# $Id: PKGBUILD 160936 2012-06-07 06:38:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.8.3
-pkgrel=3
+pkgver=4.8.4
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -25,9 +25,9 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.
'kde-applications-menu.patch'
'use-pythondontwritebytecode.patch'
'khtml-fsdg.diff')
-sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2'
+sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- 'a1e35760d5b4e29471ad357c963a343c67200f32'
+ 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
'a1502a964081ad583a00cf90c56e74bf60121830')
build() {
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
index bab46a9a2..e221e939a 100644
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -25,14 +25,14 @@
- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
- ADD_CUSTOM_COMMAND(
- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
- DEPENDS ${_absfilename}
- )
- ELSE(_abs_bin_py STREQUAL ${_absfilename})
- ADD_CUSTOM_COMMAND(
- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
- DEPENDS ${_absfilename}
@@ -60,14 +60,14 @@
+ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
+ ADD_CUSTOM_COMMAND(
+ TARGET compile_python_files
-+ COMMAND ${CMAKE_COMMAND} -E echo ${message}
++ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+ DEPENDS ${_absfilename}
+ )
+ ELSE(_abs_bin_py STREQUAL ${_absfilename})
+ ADD_CUSTOM_COMMAND(
+ TARGET compile_python_files
-+ COMMAND ${CMAKE_COMMAND} -E echo ${message}
++ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+ DEPENDS ${_absfilename}
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 1c2292a45..b221fbca7 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 158333 2012-05-03 17:21:20Z andrea $
+# $Id: PKGBUILD 160882 2012-06-06 16:17:23Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgbase=kdenetwork
pkgname=('kdenetwork-kopete-libre')
-pkgver=4.8.3
-pkgrel=3.1
+pkgver=4.8.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -15,15 +15,10 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
- 'gcc47.patch')
-sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd'
- '0e1325569e296d98e7b1be12305c1c018104685b')
+ source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458')
build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -p4 -i "${srcdir}"/gcc47.patch
-
cd "${srcdir}"
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
diff --git a/libre/kdenetwork-kopete-libre/gcc47.patch b/libre/kdenetwork-kopete-libre/gcc47.patch
deleted file mode 100644
index 78af901dc..000000000
--- a/libre/kdenetwork-kopete-libre/gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762
-@@ -31,6 +31,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <unistd.h>
- #endif
-
- #include <cstring>
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762
-@@ -27,6 +27,12 @@
-
- #include "talk/base/ssladapter.h"
-
-+#ifdef POSIX
-+extern "C" {
-+#include <unistd.h>
-+}
-+#endif
-+
- #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
- #ifdef WIN32
- #define SSL_USE_SCHANNEL 1
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762
-@@ -198,15 +198,6 @@
- }
-
- template<class CTYPE>
--size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
-- va_list args;
-- va_start(args, format);
-- size_t len = vsprintfn(buffer, buflen, format, args);
-- va_end(args);
-- return len;
--}
--
--template<class CTYPE>
- size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
- va_list args) {
- int len = vsnprintf(buffer, buflen, format, args);
-@@ -217,6 +208,15 @@
- return len;
- }
-
-+template<class CTYPE>
-+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
-+ va_list args;
-+ va_start(args, format);
-+ size_t len = vsprintfn(buffer, buflen, format, args);
-+ va_end(args);
-+ return len;
-+}
-+
- ///////////////////////////////////////////////////////////////////////////////
- // Allow safe comparing and copying ascii (not UTF-8) with both wide and
- // non-wide character strings.
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 0bda68d17..5558e73f4 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158207 2012-05-03 13:23:51Z andrea $
+# $Id: PKGBUILD 160887 2012-06-06 16:17:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.8.3
+pkgver=4.8.4
pkgrel=1
pkgdesc='Archiving Tool'
url='http://kde.org/applications/utilities/ark/'
@@ -19,7 +19,7 @@ replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('9ff1fff082f53f31d0d31f2570005ae551fd2164')
+sha1sums=('1d0d311beb8beeee7f33a58baef7f95192eb69ac')
build() {
cd "${srcdir}"
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 72f4c464d..f60e4c99f 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154187 2012-03-24 08:44:42Z allan $
+# $Id: PKGBUILD 161268 2012-06-08 11:32:36Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
@@ -6,7 +6,7 @@
pkgname=linux-libre-api-headers
_basekernel=3.3
-_sublevel=2
+_sublevel=8
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
pkgdesc="Kernel Libre headers sanitized for use in userspace"
@@ -19,7 +19,7 @@ replaces=('linux-api-headers' 'kernel-headers')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
md5sums=('5487da14ca81715a469c7594d39722fa'
- 'b43d3bdecfa355bf45bd1154819e3687')
+ 'd561c637365f1f0fca29aca39f7a3903')
build() {
cd ${srcdir}/linux-${_basekernel}
@@ -40,5 +40,5 @@ package() {
rm -rf ${pkgdir}/usr/include/drm
# clean-up unnecessary files generated during install
- find ${pkgdir} -name .install -or -name ..install.cmd -print0 | xargs -0 rm -f
+ find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
}
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 84a6f47fa..840a7f922 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
pkgname=your-freedom
pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
+pkgrel=3
pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free."
arch=('any')
url="https://parabolagnulinux.org"
@@ -23,4 +23,5 @@ package() {
sort -u
))
}
-md5sums=('0025025765e754425e381e8e2d136740')
+
+md5sums=('e2527b2b2bada2b4115f72bccef281c3')