diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/icedove-l10n/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/icedove-libre/PKGBUILD | 11 | ||||
-rw-r--r-- | libre/iceweasel-l10n/PKGBUILD | 14 | ||||
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 17 | ||||
-rw-r--r-- | libre/iceweasel-libre/libre.patch | 45 | ||||
-rw-r--r-- | libre/iceweasel-libre/replace-urls.txt | 26 | ||||
-rw-r--r-- | libre/linux-libre-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 14 | ||||
-rw-r--r-- | libre/linux-libre/config.i686 | 11 | ||||
-rw-r--r-- | libre/linux-libre/config.x86_64 | 10 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
-rw-r--r-- | libre/parabola-xdg-menu/PKGBUILD | 10 |
15 files changed, 77 insertions, 101 deletions
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 7d5c1e691..d9c2c7481 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -14,7 +14,7 @@ pkgname=($(for lang in ${_langpacks[@]} pkgrel=1 pkgdesc="Language packs for Debian Icedove." arch=('any') -url="http://packages.debian.org/experimental/icedove" +url="http://packages.debian.org/sid/icedove" license=('MPL' 'GPL') depends=("icedove-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index d76893934..8473cadd8 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer : Márcio Silva <coadde@lavabit.com> # Maintainer : André Silva <emulatorman@lavabit.com> -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=icedove _debver=17.0.5 _debrel=2 @@ -15,9 +15,9 @@ pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -88,6 +88,9 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix virtualenv path + sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure } build() { @@ -120,5 +123,5 @@ package() { ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins" # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl} + rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl} } diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 3eb6b36b4..3c3d957a4 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -37,7 +37,7 @@ do source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") done -_path="/usr/lib/iceweasel/extensions" +_path="/usr/lib/iceweasel/browser/extensions/" build() { cd "${srcdir}" @@ -162,14 +162,4 @@ md5sums=('e88728730ecf9f0f145de5f70e362b15' '98c7ed17e8fbe4478032a31ad2c2aa07' 'a7c33685d88af8a90a14c874538fa53a' '9b43e2e557c82a20509f34a54cc42e0f' - '84e12ebfd749a04adc5b3ace348a06f1' - '7f11378288e629d63cb04649a234cf1c' - '1af944e12101d8a279bda6ebf665a767' - 'd3a7e1dd8186bfcefe973d77214ec9c0' - '7a12ccf5eee1144bfb61984f811faf66' - '67407c724be7d200a06912c83a3404d8' - 'f3c7e564aa585251d8c908e666ce9f64' - 'ace03ba25a56488ddbf38a656daf6c93' - '4612b54bc7712d99823515799abf41d9' - '3eb4be0b553933b0babc582444ecaa6c' - 'ad78e4e0757bc0d8d956b06b3bae8c17') + '84e12ebfd749a04adc5b3ace348a06f1') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 253572553..eebf10e57 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -50,16 +50,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel-install-dir.patch vendor.js shared-libs.patch + replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('0a7c51bb494463c327af918bae6c4ee4' 'c17121a4ffd40f463e16d7828445d96e' 'e1e903ca91997f18b428c54ef604f27d' '383e8e2a97a8b13fe56d153adb6878b6' - '98a433139ffcbf6b3018f18dcaacdb4c' + '2930f3bffe0d7a6b9845f8c006821bc2' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' + 'a8fc4658d45b6bf9350023e5c3f34e56' '85e67561e0e491cd538ce018dfc2d948') prepare() { @@ -84,6 +86,17 @@ prepare() { patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/shared-libs.patch" + # Replace common URLs + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + if [[ -n $moz_url ]]; then + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + grep -Erl "${moz_url}" \ + --exclude='*.'{patch,orig,rej} \ + --exclude-dir={.pc,test,tests,testing} \ + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + fi + done + # Patch anything that's left patch -Np1 -i "$srcdir/libre.patch" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 0588fa632..3bb39d215 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,41 +1,6 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js --- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 +++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 -@@ -37,11 +37,11 @@ - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); -+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); -+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); -@@ -64,7 +64,7 @@ - pref("extensions.autoDisableScopes", 3); - - // Dictionary download preference --pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "https://trisquel.info/browser-plain"); - - // The minimum delay in seconds for the timer to fire. - // default=2 minutes -@@ -601,7 +601,7 @@ - pref("accessibility.typeaheadfind.flashBar", 1); - - // plugin finder service url --pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); -+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); - - // by default we show an infobar message when pages require plugins the user has not installed, or are outdated - pref("plugins.hide_infobar_for_missing_plugin", false); @@ -1203,12 +1203,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -51,13 +16,13 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("social.toast-notifications.enabled", true); diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-16 23:09:05.295723370 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300 @@ -3,69 +3,41 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { - "Google": { -+ "DuckDuckGo": { ++ "DuckDuckGo HTML": { image: "data:image/png;base64," + - "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + - "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" + @@ -156,17 +121,15 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil } }; -@@ -75,8 +47,8 @@ +@@ -75,7 +47,7 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" --, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" + "http://packages.debian.org/experimental/iceweasel" -+, "https://trisquel.info/browser-plain" + , "https://www.gnu.org/software/gnuzilla/addons.html" ]; - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. @@ -139,10 +111,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt index 5f8c88e9e..fc13e32fb 100644 --- a/libre/iceweasel-libre/replace-urls.txt +++ b/libre/iceweasel-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/?(\?[^"']*)? https://trisquel.info/browser-plain +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain" +"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 4c1daea62..b3176ccbb 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.2 +_kernver=3.9.3 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 6e2796cff..3c8924131 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.78 +_kernver=3.0.79 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=2 +pkgrel=3 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index efd3cd3c8..2dcd13686 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185334 2013-05-13 12:44:58Z tpowa $ +# $Id: PKGBUILD 185987 2013-05-20 06:38:28Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=78 +_sublevel=79 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.78 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - 'd4c068f9b6fb431f606220ec8e707fa1' + '4ddd90d45cc8a4e663ef1e984e731232' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b4c66216e..8bf93b71e 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.78-1-LIBRE-LTS +KERNEL_VERSION=3.0.79-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index cf56e1f37..e5f7a6bc1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $ +# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '1a5e653d2c281cccef9b44340a94a866' - '9684934c48eb2c7bb7179b7e5b2c245f' - 'd9ff747f6c2bd3a6e4a94a2abc4af9ca' + '4ddd90d45cc8a4e663ef1e984e731232' + '9de4af59b9c560df524b525afa117328' + 'f350294046f6a74ac1d2748ac6326723' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '2cc468726d0b215d45cbd28be6dee198') + '4e229083e416b258e0957299971d7859') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index ed48ff54b..62baa74b7 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -87,7 +87,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1874,7 +1873,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -5048,6 +5047,9 @@ CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -5432,7 +5434,6 @@ CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m CONFIG_ZCACHE=y -CONFIG_RAMSTER=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5725,6 +5726,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5738,6 +5740,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index faee36762..0a16459f0 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0-2 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -89,7 +89,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -4862,6 +4861,9 @@ CONFIG_EDAC_I7300=m CONFIG_EDAC_SBRIDGE=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -5514,6 +5516,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5527,8 +5530,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index f849635c1..a595bb180 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.2-1-LIBRE +KERNEL_VERSION=3.9.3-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD index 68615937c..e601bcb41 100644 --- a/libre/parabola-xdg-menu/PKGBUILD +++ b/libre/parabola-xdg-menu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $ # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=parabola-xdg-menu -pkgver=0.7.5.5 +pkgver=0.7.6.1 pkgrel=1 pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)" arch=('any') @@ -18,9 +18,9 @@ source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.g replaces=('archlinux-xdg-menu') conflicts=('archlinux-xdg-menu') provides=("archlinux-xdg-menu=$pkgver") -md5sums=('dd139571e537bbe0190eca53eabb8fd2') +md5sums=('faa2077140c3d5bacc1de974a9eb3384') -build() { +package() { cd $srcdir # Rebranding Archlinux to Parabola @@ -42,7 +42,7 @@ build() { install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su - install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus + install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf mkdir -p $pkgdir/usr/share/desktop-directories/ cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/ |