diff options
| -rw-r--r-- | libre/iceweasel-l10n/PKGBUILD | 182 | ||||
| -rw-r--r-- | libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 4 | ||||
| -rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 59 | ||||
| -rw-r--r-- | libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png | bin | 12184 -> 0 bytes | |||
| -rw-r--r-- | libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch | 36 | ||||
| -rw-r--r-- | libre/iceweasel-libre/libre.patch | 20 | ||||
| -rw-r--r-- | libre/iceweasel-libre/mozconfig | 1 | ||||
| -rw-r--r-- | libre/iceweasel-libre/shared-libs.patch | 12 | ||||
| -rw-r--r-- | libre/mc-libre/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/mc-libre/fs36962.diff | 77 | ||||
| -rw-r--r-- | libre/python2-reportlab-libre/PKGBUILD | 25 | ||||
| -rw-r--r-- | pcr/android-udev/PKGBUILD | 26 | ||||
| -rw-r--r-- | pcr/android-udev/android-udev.install | 12 | ||||
| -rw-r--r-- | ~lukeshu/android-udev/.gitignore | 1 | ||||
| -rw-r--r-- | ~lukeshu/android-udev/51-android.rules | 232 | ||||
| -rw-r--r-- | ~lukeshu/android-udev/Makefile | 39 | ||||
| -rw-r--r-- | ~lukeshu/android-udev/PKGBUILD | 22 | ||||
| -rw-r--r-- | ~lukeshu/android-udev/android-udev.install | 15 |
18 files changed, 271 insertions, 505 deletions
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 19400ce5f..a135d161e 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -11,8 +11,8 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=23.0.1 -_debrel=deb1 +_debver=24.0 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ pkgname=($(for lang in ${_langpacks[@]} done)) epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -76,91 +76,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { done md5sums=('e88728730ecf9f0f145de5f70e362b15' - 'beec7ff5243399aaa490eeb908f89635' - 'd76b30288dc5aa89c5c73327dd93e1f1' - '0d7a7d3f9afd4f4f535813ddbe295979' - 'a3e395704283a7b04f5a2b622f4a3639' - '4957794086a29eb2aab2f9486a0749dd' - 'd42f22d4e8f0877b94e129d5898074ea' - '8d87c38d9e07847e774152f7f34b0d3a' - 'd5442982475a1948794267c6f2e8dab7' - 'cbe6d536bb393a71827721acc8b5a592' - '92966282e3cb266006c1814af8e0ff0a' - '8dc3cd2b6892457752e8232ff0bdacd2' - '36fa29d00055b28c40276ada3008da20' - '4535bbb5f058fad2635c65a77ca948af' - 'd55e19c70c143893334d76d803c6ad19' - '48ecdc05f12a84745e1f170790ab427f' - 'c50af900a16d3e7f95dd7768dd04e8a2' - 'd8f113de7e79743d4cb9beb127f0f95b' - 'ee686438c9a3ea9041c19bb75f53651a' - '358203acae7af9752fa65550ca98f02e' - '726be61d6cfefcd671c24f2f49e3bf21' - 'c15c9b35ef2bf000f3f7f8b2946aee6d' - '086b14122e3e45dac497ffe7f0873c02' - 'c9c80acbc1651ebf9d025d0d3d1cd022' - '15ef0474ce040d9600690cdd2b257ffd' - '4da96de48891501d947bce50f30d0f1a' - '05945026206a9b0f99b09c5ce788ca6b' - 'd636a741c3711d111ad0e04d905b2fd0' - '05d3bac10f8d7fc19f7941b479f44363' - '5abaab886f963e387444e47d993d9c1a' - '1a89211f0ec11c0541e4d4e983209ce9' - '815e0f6a34ed7c63c21403473bab0ac6' - 'b2e768d738718f20cf6e27f6a393f093' - 'ea65c30d06da6172848c84dc6e4e2be4' - '49e108b2ed86ae25acae56731685170d' - '8222761ee3bea5d67cd66d461e698fe6' - 'a04b35692c4df0f410bf2d196de96928' - '861e047041ef3a8f6a92967d40fe8e5f' - 'd43c967887b437c67c6d39d3c4273c49' - 'fb8a80a7d82d5a37b926e0a946240df8' - 'ffdcc759130ad0f23adee6ca8933190d' - 'dcd9b3889b7050bc3e977cfa013fc2c1' - 'd59b7828235ed96da7e309e43093923c' - '723db17fbf3ac58ed3402b44eb25c953' - '3f27760db7543ad953bf3b87bd1f61b1' - 'ac675403c62a5b898c58ab3e95770275' - '7295a8115d6a0d8706ee5ea4a4a0e1fc' - '4073b8aca4a5eb905df761ab90e8d63a' - 'f437bf5c2bdc9a29b6deff2bf3913af2' - '1a4f3e90be3aaf92763b6aa7c09db41c' - 'dbd3ae230ca8f898f55d73406881fb4b' - '2d99549940ab6ec77cabb6dacf1ecc22' - '71eba86c8ba6c60aedccbac67d730f64' - '327e3808ed2318335ddb17480254098b' - 'b3880a5392906d7547cf6f1f460fb587' - 'd3831ed5839155fedd6afe140d9b82d3' - '4bbc2b071e3a691c7e31eb203473e4fe' - 'b6a0a5958b8d7715bff75998f7a2db5a' - '12d766edda51a500763cab832d456f1c' - '7d8836f1beba05abd2f4980a739b88f6' - '6e6c387f87e66fcd0256e7dd493bd3b0' - 'acf3313e15e39c40a5e4a81a8ad8f082' - 'b297d9639d918543c6d49be2b41ecb7a' - '1a44e1284df3dea096ba6d66babcb627' - '59eff511de5712076688a1fdc1ad7cab' - '2c6d376215919347a3700e5ca189fbae' - 'c4721d42d1c5ca7c864ea676fb0eaa67' - '099efdf95306a754ff96b3b40e9442aa' - '41800618dfebb2793473d24469b42648' - 'd3af544bb441f124434a8494ea90803d' - '279690d65ff8c2d8327476df378cb560' - 'ec8d0c327f8ab2b1a4a4db2956e35aa1' - '6ac9eddd9eb0080bc0ed130f293212a6' - 'f18b1756afbfc609e474987713463cb0' - '5aa659699e413ee6c1581dd5f8abc982' - '51d5f2d0832b3e112505d097f927e237' - '194772120040d425c0f9caf7e39cd859' - '16e341fc147ac7c59927aa9fcd1d9bda' - '0f03f21b274f83dab26b13f24c62b10c' - '08e4f2dbb5812c26108043c921f96f52' - 'e698080ded6dd46631a82d4c5e2714a4' - '1ec71119addcae00dc488bce157e730b' - '52a0d08f300889601ede8f7ab149c402' - '75a0dd75f495e8b45dc8b5529cdac123' - '751faf67d7395acdf647e944582f1720' - '58da93b8de0d043e2c875bede1d339b7' - 'c7472e6661159c338b29a9f0d67534eb' - '90df70450031fbeeef121170875e2a56' - 'c34f1814457e56a2f922da4c630d6c98') + '8b54f8c36f8465987871145fd70956ce' + 'ad3a11f1485a58a0ad59d861d37a08a5' + '9761805e9011c371bb443d8f74fede3c' + '87bb6a20535feb2692aa2a6a1afa11e5' + '656dca2918d356fbe368b18fb9eac7ec' + 'e1c793ac7d7beed9d21631154c3dbe1c' + '862470f8d5ee8f8d2f68afc7f4a3d5c1' + '5d7d027fe8c821689a4fdb022fdf7b1f' + 'ab298b1e9d86dfccb6797a8f2f28c8af' + '4c3dd02509c0f7a8506b7303a410692b' + 'ebe4f9e91981bbe85d4f2024325d4cf2' + 'c7e1dae44043c1236f96739ad1117fbe' + 'b33da7699c2a2f5e0febd11e4489d382' + '63c8b3e4c079fbbd98e321035b5c6317' + 'f14d3462af09d8094393ee16f679e5ab' + '0eac6ddbcce45fd8e9a202c93a3738cb' + 'c837f374f56c0bd6efdde745dce89f8a' + '5f780c1b42835050c39db15493dff728' + '69303505295c74467a56aa2a43ea2b82' + '7c44dba21f5d03604b5dd120231a00ae' + 'a401bc653b544ac4f259cca56b79d96d' + 'abdac5ba27fc5cd2ec4d5bc514772670' + '0ddc4de7b3050ed2a49233fbe18eebb3' + '7d09b317736ba78bd6bcf86f5f6e1e11' + '14d1ceaaef00130134e017ae868db8ea' + '9ddedfef7ffea213ef4d4e1773b3ad15' + 'ae89977182d5998204b8ebc1e2603e9f' + '642cdf237587093072412720fb36485a' + '113ef967c5c05ae9ceae093064fdc116' + '90425e1d17c39090a68014c6ce7fb17b' + '0d9e0fc7162eb0aca197866ef427f481' + '95cc1695aa5bffbdcbcb773fb0430319' + '1475a2ad88c8699a9c36e07baed988e0' + '26fd5bf6e4e0a6c634ca7632fb20d69d' + '1cfb6db8de12e0698f0663fffe651962' + '47cbb471101ed09e1d43f85a38cac91f' + 'e8cb435f70c0d62b07cddf051b2e6a5b' + 'bc58060bf3539ab408f1a331ec617949' + '01e8eedc1594c13db4f8a991fcf87f83' + '91179c0d3ee8f003a848eedd2435ea3c' + '0bac7e153488e965f164d61d81de87cb' + '4dabbdfa4fe6477e862eb381eb2c4fd0' + 'a83a772712ae74ddb309cb4a7cb52f75' + 'e16444075ca17e7b5961f7e1e0a828bf' + '4df54bf6c1b1cb35a130d34f9a981eec' + '27e8f49d9a73c79515aa75304758ae22' + '4ad85b335fd26d3474548433fd20d919' + '7f63adfe80832afc40cc3774b48fdefc' + 'dbeac803ed5906af388d2130cdac5c32' + 'f82ba92549541e2d89d5040d175a11d8' + 'bd46bc7902cba8866ffedbb50c8ca2f8' + '203f1fcb9dd3de9396787fc9dab0312a' + 'da685c4c4bd727b337bb720d83de8cf5' + '42fbbda5287dfbf11619e6046bd06f8b' + '65844655106abc5fba71a2cd9bec2d26' + '4ad3f9cbb469aeca27443e39a53e8c73' + '9225277738d7a0fb8b585314ecdb642f' + '292574470c2daeda3c005b12d8a66269' + '954554b04d7aee0c6662d2edf7b48c1b' + 'f15824595b7aab31ce8cc91de781ea03' + 'c5f2c9ddb5775179be5eea13b12f843f' + 'def21db04a3b606c603412d7a0091041' + '686fcc1eefcce197c8b27363c5db6f34' + '9eb2657a7af95927274b0453056173b3' + '58e3dedcb8c0f85766aaaa0d35746b94' + '209670672c37d4befa4375528385ae4a' + 'f3b09defe2dd33f94c5aa4f3c19d726e' + '3f05b588ddea099c873203267287e296' + '91180565b17731d4ff40e6612f499527' + 'fac9050297be0dfe64473d3fe3bce03b' + 'd72a455cd79e304627db71c0ad42e42c' + 'f271b0a4b2d348edca352611da9fa79e' + '367a12e148e94885d5141a7b374523f7' + '18fb3c7bbfdf0b81a40ef5f0bd9d3c2c' + '4e5418b69f62e5d281aa98b0089149de' + 'bfdf7ae55a0994fbe3ed2359dfd2d437' + 'e7b4b504e518b16bb5d9cea8770b1b7a' + 'a8719e1294071e9e0366f686b89a793f' + 'c422789ab794748200b3d33f660b0076' + 'ac040347a410692fea6b7fdda06802cf' + '97c066c4bd823d8f3157fbb390cbaaac' + '3167b085b038f6f1bde2530a167e7405' + 'e969d0185a8c34341edba2ea2e70a476' + 'aff3452e3b6663a2e2f8870924bfded6' + '44519549cf6b052b49519c9960f97481' + 'fe67796800cb807148a39722d689a4c7' + 'b947f013e632c6d262ebdbfac53e3958' + '677267c8284fca2b3749f53eba598121') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 9fbb5f84a..5d56ee23b 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -268,10 +268,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 90641ed..1806e0c 100644
+index cc3f65e..cdd4305 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
+@@ -3731,7 +3731,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 1918e27a6..955506d99 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,8 +14,8 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel -_debver=23.0.1 -_debrel=deb1 +_debver=24.0 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,13 +23,13 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) +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=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then @@ -37,6 +37,10 @@ if $_pgo; then options+=(!ccache) fi optdepends=('networkmanager: Location detection via available WiFi networks' + 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-good-plugins: webm and mp4 demuxing' + 'gstreamer0.10-ugly-plugins: h.264 decoding' 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install @@ -51,22 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel.desktop iceweasel-install-dir.patch vendor.js - shared-libs.patch replace-urls.txt - $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('43ca6c80e00f5812cb1a38d87f838e06' - '0eb0d65b6dbb035b7b8d753c68fda6aa' - '2d7ac85c32df6a4ccfcc6de7a1420bf7' +md5sums=('8f24807d67599516850a4bdca2b2fbd6' + '1f4f1347e05b15f5af137787d614ecdf' + '350feec44d359c31679dbec3de6685df' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '4f656688fe7bc0b11899369e0e23e516' + '5b32b39c033a33f45e2cfc6c3e80f20c' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0b88d6142f6131711dcb1a2d87a12ad2' - '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '6e335a517c68488941340ee1c23f97b0' - 'c8ee0925def9f018cde65950f66e5844') + 'f1594fa3567e5b70202c3432d7c00202') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -88,7 +88,6 @@ prepare() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch 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 @@ -144,14 +143,12 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" + # Use gold, as Mozilla can use some of its features, such as safe ICF + #ln -s /usr/bin/ld.gold "$srcdir/path/ld" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - - # Fix tab loading icon (flickers with libpng 1.6) - # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \ - browser/themes/linux/tabbrowser/loading.png } build() { @@ -163,20 +160,26 @@ build() { export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - # Work around memory address space exhaustion during linking on i686 if [[ $CARCH == i686 ]]; then + # Work around memory address space exhaustion during linking on i686 LDFLAGS+=' -Wl,--no-keep-memory' fi if $_pgo; then - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - - if ! make -f client.mk build MOZ_PGO=1; then - kill $! - return 1 + if [[ $CARCH != i686 ]]; then + # Set up PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 + fi + + kill $! || true + else + make -f client.mk build fi - - kill $! || true else make -f client.mk build fi diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png Binary files differdeleted file mode 100644 index 55f25e591..000000000 --- a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png +++ /dev/null diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch deleted file mode 100644 index 56e4bfc45..000000000 --- a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# HG changeset patch -# User Patrick McManus <mcmanus@ducksong.com> -# Date 1365623297 14400 -# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb -# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 -bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell - -diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp ---- a/netwerk/base/src/nsProtocolProxyService.cpp -+++ b/netwerk/base/src/nsProtocolProxyService.cpp -@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal - - // Proxy auto config magic... - if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { - // Do not query PAC now. - *usePACThread = true; - return NS_OK; - } - -- // proxy info values -+ // If we aren't in manual proxy configuration mode then we don't -+ // want to honor any manual specific prefs that might be still set -+ if (mProxyConfig != PROXYCONFIG_MANUAL) -+ return NS_OK; -+ -+ // proxy info values for manual configuration mode - const char *type = nullptr; - const nsACString *host = nullptr; - int32_t port = -1; - - uint32_t proxyFlags = 0; - - if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && - !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { - diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 1539c709b..504ebca91 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -209,8 +209,8 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-18 08:01:12.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-26 22:44:10.393864883 -0300 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-09-10 20:14:52.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-09-18 17:24:08.209539436 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -243,7 +243,7 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio - -# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s - @@ -281,22 +281,22 @@ diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/la remote="true"/> </window> diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2013-09-10 20:14:52.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-09-18 17:41:28.559462661 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> + <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index a5af10e63..d2ea098d2 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -24,7 +24,6 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification -ac_add_options --enable-gstreamer ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/libre/iceweasel-libre/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index 3faac3646..e270f8d3d 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95010 2013-08-03 09:40:52Z schuay $ +# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> _pkgname=mc pkgname=mc-libre pkgver=4.8.10 -pkgrel=1 +pkgrel=2 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" @@ -15,7 +15,6 @@ depends=( 'glib2' 'gpm' 'libssh2' - 'pcre' 'slang') makedepends=('libxt' 'libx11') optdepends=( @@ -45,11 +44,14 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/mc.keymap' 'etc/mc/mc.menu' 'etc/mc/sfs.ini') -source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") +source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2" + "fs36962.diff") build() { cd "${srcdir}/${_pkgname}-${pkgver}" + patch -Np1 < "${srcdir}/fs36962.diff" + ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \ --with-x --libexecdir=/usr/lib @@ -69,4 +71,5 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('eb4bdc23abd4fdfa14911d53d65c8186') +md5sums=('eb4bdc23abd4fdfa14911d53d65c8186' + '7f7cf5388a5390c2ed49965492f490aa') diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff new file mode 100644 index 000000000..0db5ed42b --- /dev/null +++ b/libre/mc-libre/fs36962.diff @@ -0,0 +1,77 @@ +diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c +--- mc-4.8.10-orig/src/filemanager/file.c 2013-08-02 22:02:40.000000000 +0400 ++++ mc-4.8.10/src/filemanager/file.c 2013-09-17 09:59:30.699635407 +0400 +@@ -1272,8 +1272,8 @@ + + /** Initialize variables for progress bars */ + static FileProgressStatus +-panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source, +- FileOpContext * ctx, filegui_dialog_type_t dialog_type) ++panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx, ++ filegui_dialog_type_t dialog_type) + { + FileProgressStatus status; + +@@ -1282,7 +1282,7 @@ + return FILE_CONT; + #endif + +- if (operation != OP_MOVE && verbose && file_op_compute_totals) ++ if (verbose && file_op_compute_totals) + { + ComputeDirSizeUI *ui; + +@@ -2378,13 +2378,6 @@ + mc_refresh (); + if (ctx->erase_at_end) + { +- /* remove files after move */ +- if (erase_list != NULL) +- { +- file_op_context_destroy_ui (ctx); +- file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM); +- } +- + while (erase_list != NULL && return_status != FILE_ABORT) + { + struct link *lp = (struct link *) erase_list->data; +@@ -2792,14 +2785,12 @@ + { + if (operation == OP_DELETE) + dialog_type = FILEGUI_DIALOG_DELETE_ITEM; ++ else if (single_entry && S_ISDIR (selection (panel)->st.st_mode)) ++ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; ++ else if (single_entry || force_single) ++ dialog_type = FILEGUI_DIALOG_ONE_ITEM; + else +- { +- dialog_type = ((operation != OP_COPY) || single_entry || force_single) +- ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM; +- +- if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode)) +- dialog_type = FILEGUI_DIALOG_MULTI_ITEM; +- } ++ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; + } + + /* Initialize things */ +@@ -2844,8 +2835,8 @@ + else + source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL); + #endif /* WITH_FULL_PATHS */ +- if (panel_operate_init_totals +- (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT) ++ if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) ++ == FILE_CONT) + { + if (operation == OP_DELETE) + { +@@ -2936,7 +2927,7 @@ + goto clean_up; + } + +- if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT) ++ if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT) + { + /* Loop for every file, perform the actual copy operation */ + for (i = 0; i < panel->count; i++) diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD index 27014d100..10bb58bdc 100644 --- a/libre/python2-reportlab-libre/PKGBUILD +++ b/libre/python2-reportlab-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $ +# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $ # Maintainer: # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,26 +9,25 @@ pkgbase=python-reportlab-libre pkgname=python2-reportlab-libre _origname=reportlab -pkgver=2.6 +pkgver=2.7 pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution (without non-free Adobe T1 fonts)" +pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts" arch=('i686' 'x86_64') url="http://www.reportlab.org/rl_toolkit.html" -depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') -conflicts=('python2-reportlab' 'python-reportlab<=2.5-2') -replaces=('python2-reportlab' 'python-reportlab<=2.5-2') +depends=('python2' 'freetype2') +conflicts=('python-reportlab<=2.5-2' 'python2-reportlab') +replaces=('python-reportlab<=2.5-2' 'python2-reportlab') provides=("python2-reportlab=$pkgver") license=('custom') -source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz +source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz free-fonts.patch) -md5sums=('e5d27a24a2c8456b168913242aa1940f' +md5sums=('78300e6fe8a0d020fc16734a3de80cc4' '1588b88851711cc6c868db4c7d4f4dea') -optdepends=('ghostscript') build() { cd $srcdir/${_origname}-$pkgver - # remove non-free Adobe T1 fonts + # remove nonfree Adobe T1 fonts patch -p1 -i $srcdir/free-fonts.patch # Parabola contains those fonts from the ttf-bitstream-vera package @@ -43,7 +42,11 @@ build() { package_python2-reportlab-libre() { cd $srcdir/${_origname}-$pkgver - python2 setup.py install --root=$pkgdir --optimize=1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt } + +check() { + cd ${srcdir}/${_origname}-${pkgver} +# python2 setup.py tests +} diff --git a/pcr/android-udev/PKGBUILD b/pcr/android-udev/PKGBUILD new file mode 100644 index 000000000..10fe60934 --- /dev/null +++ b/pcr/android-udev/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): M0Rf30 +# Contributor: marlock + +pkgname=android-udev +pkgver=20130911 +_gitver=8dfd1cd0002d7067d24a2ef89360212f164f3856 +url="https://github.com/M0Rf30/android-udev-rules" +pkgdesc='Udev rules to for Android devices.' + +# The author is the maintainer of the AUR package, where it is listed as GPL; +# this is the best hint to the license that we have. +license=('GPL') + +pkgrel=1 +arch=('any') +source=("51-android-$pkgver.rules::https://raw.github.com/M0Rf30/android-udev-rules/$_gitver/51-android.rules") +depends=('systemd' 'libmtp') +install='android-udev.install' + +package() { + cd "$srcdir" + install -Dm755 "$srcdir"/51-android-$pkgver.rules "$pkgdir"/usr/lib/udev/rules.d/51-android.rules +} + +md5sums=('1b2033fcf52b1b0ffa807ba90b11fd14') diff --git a/pcr/android-udev/android-udev.install b/pcr/android-udev/android-udev.install new file mode 100644 index 000000000..dcb1ebc20 --- /dev/null +++ b/pcr/android-udev/android-udev.install @@ -0,0 +1,12 @@ +post_install() { + post_upgrade + echo "NOTE: To use adb as a normal user you have to add yourself to the adbusers group" +} + +post_upgrade() { + { getent group adbusers || /usr/sbin/groupadd adbusers; } &>/dev/null +} + +post_remove() { + getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers +} diff --git a/~lukeshu/android-udev/.gitignore b/~lukeshu/android-udev/.gitignore deleted file mode 100644 index 290a3baa3..000000000 --- a/~lukeshu/android-udev/.gitignore +++ /dev/null @@ -1 +0,0 @@ -aur
\ No newline at end of file diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules deleted file mode 100644 index 51f80cf54..000000000 --- a/~lukeshu/android-udev/51-android.rules +++ /dev/null @@ -1,232 +0,0 @@ -# Acer -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="adbusers" -# Iconia Tab A500 -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot" -# Liquid -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3202" -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3203", SYMLINK+="android_adb" - -# Archos -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0666", GROUP="adbusers" -# 43 -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot" -# 101 -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot" - -# Asus -SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" - -# Dell -SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers" - -# Foxconn -SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", GROUP="adbusers" - -# Garmin-Asus -SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", GROUP="adbusers" - -# Google -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="adbusers" -# NEXUS S -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21", -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e22", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot" -# Nexus One -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11", -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e12", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Generic and unspecified debug interface -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" - -# HTC -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers" -# ChaCha -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_fastboot" -# Desire (Bravo) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c87", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Desire HD -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca2", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Desire Z -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_fastboot" -# Evo Shift -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca5", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# HD2 -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot" -# Hero H2000 -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot" -# Hero (GSM), Desire -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c99", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Hero (CDMA) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9a", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Incredible -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9e", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Evo 4G, Incredible rev 0002 -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8d", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# MyTouch 4G -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c96", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Slide -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0e03", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Tatoo, Dream, ADP1 , G1, Magic -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c01" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot" -# Vision -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Wildfire -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8b", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8b", SYMLINK+="android_fastboot" - -# Huawei -SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", GROUP="adbusers" -SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", ATTR{idProduct}=="1038", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", ATTR{idProduct}=="1038", SYMLINK+="android_fastboot" - -# K-Touch -SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", GROUP="adbusers" - -# KT Tech -SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", GROUP="adbusers" - -# Kyocera -SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", GROUP="adbusers" - -# Lab126 -SUBSYSTEM=="usb", ATTR{idVendor}=="1949", MODE="0666", GROUP="adbusers" -# Amazon Kindle Fire -SUBSYSTEM=="usb", ATTR{idVendor}=="1949", ATTR{idProduct}=="0006", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="1949", ATTR{idProduct}=="0006", SYMLINK+="android_fastboot" - -# Lenevo -SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", GROUP="adbusers" - -# LG -SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="adbusers" -# Ally, Vortex, P500 -SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618f" -SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618e", SYMLINK+="android_adb" -# Optimus One -SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61c5", SYMLINK+="android_adb" -# Swift GT540 -SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61b4", SYMLINK+="android_adb" - - -# Motorola -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers" -# CLIQ XT/Quench -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2d66" -# Defy/MB525 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="428c" -# Droid -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="41db" -# -- Xoom ID 1 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_fastboot" -# -- Xoom ID 2 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_fastboot" - -# NEC -SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="adbusers" - -# Nook -SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", GROUP="adbusers" - -# Nvidia -SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", GROUP="adbusers" - -# OTGV -SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", GROUP="adbusers" - -# Pantech -SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", MODE="0666", GROUP="adbusers" - -# Philips -SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", GROUP="adbusers" - -# PMC-Sierra -SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", GROUP="adbusers" - -# Qualcomm -SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", GROUP="adbusers" - -# SK Telesys -SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", GROUP="adbusers" - -# Samsung -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="adbusers" -# Galaxy i5700 -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_fastboot" -# Galaxy i5800 -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_fastboot" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68a9", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1" -# Galaxy i7500 -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot" -# Galaxy S -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666" -# Galaxy Tab -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot" -# Galaxy Tab 10.1, i9100 S2 -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_fastboot" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1" - -# Sharp -SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="adbusers" - -# Sony Ericsson -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", GROUP="adbusers" -# Xperia X10 mini -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3137" -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2137", SYMLINK+="android_adb" -# Xperia X10 mini pro -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3138" -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2138", SYMLINK+="android_adb" -# Xperia X8 -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3149" -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2149", SYMLINK+="android_adb" -# Xperia X12 -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="e14f" -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="614f", SYMLINK+="android_adb" - -# Toshiba -SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers" - -# ZTE -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers" -# Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb" - diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile deleted file mode 100644 index f20930c66..000000000 --- a/~lukeshu/android-udev/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/make -f -# Use this script to update the package from AUR. -# This script depends on: -# - coreutils -# - pacman -# - sed -# - wget - -default: PHONY all -all: PHONY 51-android.rules PKGBUILD - -name=android-udev - -aur: - mkdir $@ -aur/%.tar.gz: | aur - cd aur && wget http://aur.archlinux.org/packages/$*/$*.tar.gz -aur/%: aur/%.tar.gz - cd aur && tar xzf $(notdir $<) -aur/$(name)/%: aur/$(name).tar.gz | aur/$(name) - test -f $@ && touch $@ - -51-android.rules: aur/$(name)/51-android.rules - sed -r 's/\s+$$//' < $< > $@ - -PKGBUILD: aur/$(name)/PKGBUILD 51-android.rules - # Update pkg{ver,rel} - ver=`grep -m1 pkgver= $<` ; sed -i "s/pkgver=.*/$$ver/" $@ - rel=`grep -m1 pkgrel= $<`.1; sed -i "s/pkgrel=.*/$$rel/" $@ - # Update md5sums - sed -i '/md5sums/,$$d' $@ - makepkg -g >> $@ - -clean: PHONY - rm -rf aur -maintainerclean: PHONY clean - rm -f 51-android.rules - -.PHONY: PHONY FORCE diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD deleted file mode 100644 index 6900b46da..000000000 --- a/~lukeshu/android-udev/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer: M0Rf30 (AUR) -# Contributor: marlock - -pkgname=android-udev -pkgver=0.8 -pkgrel=1.1 -pkgdesc='Udev rules to for Android devices.' -arch=('any') -url="http://developer.android.com/guide/developing/device.html" -license=('unknown') -source=('51-android.rules') -depends=('udev' 'libmtp') -conflicts=('udev-android-rules') -install='android-udev.install' - -package() { - install -d "$pkgdir/etc/udev/rules.d" - install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules" -} - -md5sums=('909eb7629683efae838c6e9d65966b3b') diff --git a/~lukeshu/android-udev/android-udev.install b/~lukeshu/android-udev/android-udev.install deleted file mode 100644 index c861f2b70..000000000 --- a/~lukeshu/android-udev/android-udev.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { -getent group adbusers >> /dev/null || /usr/sbin/groupadd adbusers || return 1 -/bin/cat << EOF -===> In order to use adb, you have to be in the 'adbusers' group -===> For that, use: gpasswd -a USERNAME adbusers -EOF -} - -post_upgrade() { -post_install -} - -post_remove() { -getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers -} |
