From d9c1fc1bcca8fd5cd3566fc6b183fe23065778bc Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 Apr 2012 03:46:17 +0000 Subject: Fri Apr 6 03:46:17 UTC 2012 --- libre-testing/icedove-libre/PKGBUILD | 20 +++---- libre-testing/icedove-libre/PKGBUILD.bk | 77 +++++++++++++++++++++++++++ libre-testing/icedove-libre/rules.patch | 16 ++++++ libre/kdebase-konqueror-libre/PKGBUILD | 6 +-- libre/linux-libre-lts/PKGBUILD | 4 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- 6 files changed, 106 insertions(+), 19 deletions(-) create mode 100644 libre-testing/icedove-libre/PKGBUILD.bk create mode 100644 libre-testing/icedove-libre/rules.patch diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD index 998e57d04..d904e4d2e 100644 --- a/libre-testing/icedove-libre/PKGBUILD +++ b/libre-testing/icedove-libre/PKGBUILD @@ -10,7 +10,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=$_debname pkgname=$_debname-libre -pkgver=$_debver.$_debrel +pkgver=$_debver pkgrel=1 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird." arch=('i586' 'i686' 'x86_64' 'mips64el') @@ -25,17 +25,13 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc" mozconfig channel-prefs.js - vendor.js - makefile.patch - gcc47.patch) + vendor.js) md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' 'cb3dba2916bdf2deb72248b0984c4302' '57e21e997a75d85fcc0dcfe30b83f1ee' 'fda2ff093ddbddf7f4cc3a1ed3bf9dcd' '476ec205162340fb0679f522c9d31c3b' - '4eecc4fc5aafaf0da651a09eadc90bee' - '5a6282bb005d596aa4ab1884ac6b0517' - '66376a8e934013078f0e646e49614937') + '4eecc4fc5aafaf0da651a09eadc90bee') build() { export QUILT_PATCHES=debian/patches @@ -51,8 +47,6 @@ build() { quilt push -a cp "$srcdir/mozconfig" .mozconfig - patch -Np1 -i "$srcdir/makefile.patch" - patch -Np1 -i "$srcdir/gcc47.patch" rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -65,10 +59,10 @@ package() { install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons -# for i in 16x16 22x22 24x24 32x32 48x48 256x256; do -# install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" -# done -# install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" + done + install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" diff --git a/libre-testing/icedove-libre/PKGBUILD.bk b/libre-testing/icedove-libre/PKGBUILD.bk new file mode 100644 index 000000000..998e57d04 --- /dev/null +++ b/libre-testing/icedove-libre/PKGBUILD.bk @@ -0,0 +1,77 @@ +# Maintainer : Márcio Silva +# Maintainer : André Silva + +# We're getting this from Debian Sid +_debname=icedove +_debver=10.0.3 +_debrel=3 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=$_debname +pkgname=$_debname-libre +pkgver=$_debver.$_debrel +pkgrel=1 +pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird." +arch=('i586' 'i686' 'x86_64' 'mips64el') +license=('GPL2' 'MPL' 'LGPL') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +optdepends=('libcanberra: for sound support') +url="http://packages.debian.org/source/sid/$_pkgname" +install=$_pkgname.install +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc" + mozconfig + channel-prefs.js + vendor.js + makefile.patch + gcc47.patch) +md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' + 'cb3dba2916bdf2deb72248b0984c4302' + '57e21e997a75d85fcc0dcfe30b83f1ee' + 'fda2ff093ddbddf7f4cc3a1ed3bf9dcd' + '476ec205162340fb0679f522c9d31c3b' + '4eecc4fc5aafaf0da651a09eadc90bee' + '5a6282bb005d596aa4ab1884ac6b0517' + '66376a8e934013078f0e646e49614937') + +build() { + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + + mv comm-esr10 "$srcdir/mozilla-build" + mv debian "$srcdir/mozilla-build" + + cd "$srcdir/mozilla-build" + quilt push -a + + cp "$srcdir/mozconfig" .mozconfig + patch -Np1 -i "$srcdir/makefile.patch" + patch -Np1 -i "$srcdir/gcc47.patch" + rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-build" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" + install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons + +# for i in 16x16 22x22 24x24 32x32 48x48 256x256; do +# install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" +# done +# install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" + + rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" + rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff +} diff --git a/libre-testing/icedove-libre/rules.patch b/libre-testing/icedove-libre/rules.patch new file mode 100644 index 000000000..ce857ebd3 --- /dev/null +++ b/libre-testing/icedove-libre/rules.patch @@ -0,0 +1,16 @@ +--- mozilla-build/config/rules.mk.orig 2012-03-06 13:44:49.000000000 -0200 ++++ mozilla-build/config/rules.mk 2012-04-05 22:24:29.473430588 -0300 +@@ -48,11 +48,11 @@ + endif + + ifndef INCLUDED_CONFIG_MK +-include $(topsrcdir)/config/config.mk ++include /build/src/mozilla-build/config/config.mk + endif + + ifndef INCLUDED_VERSION_MK +-include $(topsrcdir)/config/version.mk ++include /build/src/mozilla-build/config/version.mk + endif + + ifdef SDK_XPIDLSRCS diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index f3f344e30..719cd3a4f 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -6,16 +6,16 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') -source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2" +source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('7df527a537b5431ab551339338ea289c32ec43be' +sha1sums=('13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 63ad0f242..790ea5e0b 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=26 +_sublevel=27 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.26 # nearly always the same as pkgver pkgrel=1 @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'eb6cc5ce7bc5186e4f0c80efec390680' + '365d490f97b1960c8880eb22257d5ef0' 'c7acde811ca6808b294dc06480048c61' '792766d6d403cc967977f6a46aa95d1d' 'd2c0701480bce49fd4b40dc46b9863f1' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 44ba29a78..acb2b71f5 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.26-1-LIBRE-LTS +KERNEL_VERSION=3.0.27-1-LIBRE-LTS post_install () { # updating module dependencies -- cgit v1.2.3-54-g00ecf