diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/blender-libre/PKGBUILD | 14 | ||||
-rw-r--r-- | libre/cdfs-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/cdfs-libre/cdfs.install | 6 | ||||
-rw-r--r-- | libre/iceweasel-i18n/PKGBUILD | 180 | ||||
-rw-r--r-- | libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 20 | ||||
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/iceweasel-libre/iceweasel-install-dir.patch | 49 | ||||
-rw-r--r-- | libre/iceweasel-libre/libre.patch | 36 | ||||
-rw-r--r-- | libre/linux-libre-firmware/PKGBUILD | 49 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 5 | ||||
-rw-r--r-- | libre/lirc-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/lirc-libre/lirc.install | 2 | ||||
-rw-r--r-- | libre/parabola-keyring/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/tp_smapi-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/tp_smapi-libre/tp_smapi.install | 2 | ||||
-rw-r--r-- | libre/vhba-module-libre/PKGBUILD | 7 | ||||
-rw-r--r-- | libre/vhba-module-libre/vhba-module.install | 2 | ||||
-rw-r--r-- | libre/virtualbox-libre-modules/PKGBUILD | 12 | ||||
-rwxr-xr-x | libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install | 6 |
20 files changed, 228 insertions, 198 deletions
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 6e3228359..f7005d739 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -3,8 +3,8 @@ _pkgname=blender pkgname=blender-libre -pkgver=2.63a -pkgrel=5 +pkgver=2.64 +pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,17 +21,17 @@ install=${_pkgname}.install source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch boost-1.50.patch) -md5sums=('31a60b3ce5466d965cb7e2648995e092' +md5sums=('caec080d2a3dcd57fe1ca20c51c00e53' '9e5649403e51654615d30b10bc460217' '0bab80da07d980c47b8ce3cb998edaef') build() { cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch - patch -Np1 < "${srcdir}"/boost-1.50.patch - sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h - sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c + #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch + #patch -Np1 < "${srcdir}"/boost-1.50.patch + #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h + #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c mkdir build cd build diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 9827d6813..5afccbcfb 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=30 +pkgrel=31 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install index 1c3cb4f8e..aa71a92ac 100644 --- a/libre/cdfs-libre/cdfs.install +++ b/libre/cdfs-libre/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 16acf66e2..899c009f6 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,7 +9,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=15.0.1 +_debver=16.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=15.0.1 +_pkgver=16.0.1 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -40,7 +40,7 @@ build() { for f in *.deb do bsdtar xf $f - bsdtar xf data.tar.gz + bsdtar xf data.tar.xz done } @@ -56,90 +56,90 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('79831dfa9c7bc1d225c1e0731aa1812d' - '5064fdac19ceb7a0e7591e3d5227c71a' - '58e40739dfdef056300b69f3ff243bf7' - '9b1e8be0c7e9f11c1b6833622c41f7f7' - 'f2cc2ab7fd4efb94a0abc2ed9f8dcd99' - '0c6b8d597963363d4deff2ba302933cb' - '4caf1810d3ec159aaee5aabe5fb41015' - '052e9fb61183919a9cef0ba3a21c1065' - '22a4011c70c2c7f2feb56ba9aa1b75b3' - 'e450bdc0489c13da7007046efde141d7' - '1066e9b63a9615e5e705abd050886381' - 'fb21b42b85f72d29ad104ee518f86816' - '261c4edc8eb830256e60221be390d573' - '489f7bf241f72945dd8003b7d579505a' - 'e53715797a28a95dd5ebb094695f5d7d' - '965568dae2adacfaa89af19861bdd3c8' - '2c0f1dadd9dad562405bc10633e9ea55' - '6d35c2d76d364a858f60cbb8b0660a87' - 'b735ed5cffb084c1c91146d27c4023f5' - '263a9856b1a3a00b629a22f2f69c6d4e' - '6b9235119e92fe3625e7ee12ad3cf7f1' - '2a8e8f053bd70a889a15bdac9e7b48de' - '337990a6b6b32cd8602617f0542577ad' - '48613cca6a97c02403cc9690e9fd8d2c' - '8be32d05a78f7276a4a6c4fcad6de138' - 'a6ea3d88bfd8f4ef58e484639cd2a699' - 'c1d0d16819bddceed43b25e4840c5e87' - '2dcd5644c1c95add25902727e9ac7d42' - '15176fb56b7c67949ca1d29ee02ce978' - '5fc634287dae98715ce017421212cc04' - '3076e60893d0e6cd32c679d021d00630' - '0157ff70e0e09a501525c56cd3b88ea4' - 'd96211027a8225e2f72bd68abd664949' - 'ffdfb3c66259660494af038d4079c097' - 'b891b408f643120a985c9cac9e81742a' - '16353581281c2bec3c937e089fb6457e' - '3b74bab168b0e0b463082a7adfef27de' - '350212900b1b5dedfde431f3fabbf9c9' - '06939ccc30180980ea6e12eae31495c9' - '29c8cf5d130e5592b1814dcc51a2dae2' - '18bc79a25230dffe1c27ec017eb96fd1' - '55ffa67fd02875c87b2b59b3359d68b8' - '0ecb61d1344ade52509604e9586b2d4c' - '8eef6c0339ca718a14cdc74b9886908b' - '5b70ad36f87875e1743586e04b12a411' - '18ff63b7fb7b48c240c23d8b7b664ca9' - 'fd70ac793964f2ce3714f302b30406f7' - 'f06d30c67e79b8ba8fe8140dcc6a7135' - '1ce03a6583705dd86d2badc7892fe93d' - '6fd4037255e5cf8839dab79ecef04e27' - '2ac8f87c1506270fd245e94e0ac3518a' - '68ef53993504ce07ff1f6afde33cb81c' - '49c5830b53b99102543eef7314207309' - '8dc5f8b6b93e94b576ea8c10275487e5' - '8f17ba770e49782537f1735260c03541' - '96c8f2567b232854a725163160c65448' - '58e122361c24f596e2ab7a4db0bdee2e' - 'a54c41dc316660ce259451a15601644c' - '6938ca2d179eb378affc3cb42cc2c246' - 'ed3a70fc0f5ede98f3d11183c0d9617b' - 'dd9f39a6c00a2ee8afd86385a6befe61' - 'a2c421a7c15a1756f8b08806b84c448f' - '5bd32e2abf133b3ba7a38c870961a2b5' - '8d3715ee6389fc20989189ece7dac88b' - 'cc3cd43d79e2e952118e589e9cdb1519' - 'bbb1bd76a28f5f339786a15a82dc6511' - '6e305cf35820a7eb81f233ad4cf0c6b3' - 'f268902fa45c71b989ae84bff17dfad7' - 'fc19d4e5c1fe55aed5e7ff81f4c5840a' - '983e4aade5b9f3744db59cd3e36f4957' - '88323b7e6cf6f5e3a4ce1a23fc818f13' - 'e6ab0d4d5e9d3e1b7f7b994998667931' - '572900c28726fc8aa25de53af7769218' - '21b497ea035a29df60fd3e8d07b56ddd' - '8a1667e492f18344ebcbbff72b9397e8' - '007462b1c8d812c56ab5d1856f15ca3e' - '8bd629c3984be0f9deeea91515d7367e' - '6853d129015e003996ccd94cf3873893' - 'def9852b081ab0bfe9217341e1a180e0' - '3c41610d639a0d30fc38bcdfe69925f6' - '934acd8b6f51527c3d384d268b054311' - '390d48709061fe8fa586c6e5ccd36fee' - 'f02a6c5c7ff53d61576d63258e65214c' - 'cdba209a41e8d6336539dab4fb4dcfbf' - '98651af79417b210a85702e40c19d4fb' - '016841fdf23b1e3ee4d4dcb5626a8dad' - '59128bae2e6a3cf053e191bf632c47d6')
\ No newline at end of file +md5sums=('2f40a462c2850b50a604371e875fc47c' + 'b49d42e9000a1163fd74d213624d8e86' + '385aa5d0bb43d43abb5ccddaae45bdf6' + 'fce90fb3c7fddc26aa50978182f8b831' + '163277191a666f36a2885cf92a163961' + 'e99bb607fd025990604e3229ce9aa8f6' + '35dcd2dd926b6e87dda1c11405b66472' + 'debafd1aeb232448241953c66b89e63b' + 'd23722619bb0d7f94894d2357060f629' + 'cad3e2bf6d1d97fc8dd76426591e4511' + '72b529f4aa744b2368703c19080940f7' + 'f0b1b1ee217230bd735c80b881657c92' + '9335e2678d66366a03ddfb4028b5c15e' + 'a173f9f07df4cc614e23694b0e2f3ca1' + '5cd9492c24fe0476431ecb83dfa660ee' + '9f7c84b8269c756ac9feb96e59e4c903' + 'a7dc03ef8409f2da04fc3a0a52016631' + '10e89e4953f1b9269e873345f03b867b' + 'd893c8d240fc27a60b39f91f53a309cc' + '34b2d538d41fdcfd01d34a7cfb147135' + '1ce5f6b8a2e3e4921263d5af004f40bb' + 'e59d36431f7f12eed4b7c89e2597fa6e' + '68684fce0eb66875f6d64f93b2e5fb4f' + 'ecbf294dc3ac7bc558969479b3619501' + 'a6226b0ab4b404d5e15194b7fd613604' + 'a7234e85380e6cb647026a40275416e9' + '7b2877ea2915bdbabd2748ef4b180755' + '2adee8f256369fe890445eeffcd361c6' + 'd9b1853f350d4124e5ebc2561beb8814' + 'df6fa75a7165973d426c7d74e6c06cee' + '8ca0f965013836a32e4583da92149099' + 'f007c9402015858a7a817be7f9038bbe' + 'a7e87b3320cfea4d7b5d95b3f6769cd7' + '05659f1784f63c55dfe6735823b2e23a' + 'a08a8a2504a8b5f2e419ed9f969a32be' + 'ce7d8708af5982b26d645b7cd7e5b33b' + '77d7d6a32bffdcd46e8d4444f05b645d' + '5fcf6fd003938edeea07be704c92de74' + '8a83c45d55ee7b69cb895e33db3cfeb4' + '561255aeb09362d5ed5b3c4bfdf8f293' + '77f3d9c38dca64141d32babed3c4afb7' + 'c30689f2cf263d4780bd106af2a68d0c' + 'd25d040fd7d824f848b3b9a5fbddb446' + '30af6b1339fdda31b1acffa87a914363' + '582116acc9c6e38226bc8e256ab6bb9b' + '51811e3139cc4e514cf3d8c29e468e7c' + '987fab8eccf60ffbbb685e7af297030b' + '60f217af071d95743aad066daadc1a95' + '649e1a6e583aed2811427f3493b0aa74' + '33ba3c51cff806110324d0f27a63848f' + '8dbd143d46cc51b373f6b61f1a27d6f4' + '3fb0bec111ccc6dabe6c785810c40620' + 'fc71d03873e7e1d4099702c1ab24c6da' + '775894f40a434b91f3489ff19f8237ee' + '71416fc9bf41b2c6719bc0b3c55e7b7b' + '30f988322526cfc25b15cb9179d69be4' + '195a1099a613215160c8be5f63169ce3' + 'b59a10c70e33920d08750b76349ae764' + 'd9f0b1dd204b34a78faca8b0de73fe2a' + 'dd3eae36828975d87477fe465406e1e6' + 'f8fbcee8171a6f7e0e81f8e0e3a381df' + 'd5e5b6d7f4018b34fe01980548221332' + '7db06a1a09551d6ad943feb398affe57' + '7e7e0ccae292b3423d5d1a5dd848abe0' + '8397c0e05c04c6b054de4fe524a95c42' + '89becfa004fb398d2409800f5fb15179' + 'd90fbc489d9993177a36ae788f9f23ed' + 'b5aa84fbfa8e7ab12417b23f003fb17e' + 'faf8056065dcf815e9a305b2739d0063' + '2e42ba1813720717da72041989c02880' + 'a37d32a8cd3b8a5d4247527e6bc82380' + 'd651717b27c2ffd4ce52d3c51b18dd85' + '2cc13f741a6910db6c3d00e7c53fb575' + '31755af06ea85ac187588076d20fa991' + 'ff2ff3b748ef2dab4371897bfdc96dd4' + '2f38fda847f928bee7fba4772360699b' + '4e8c459c0c5d009c633e843a0420d113' + '4ce85d3534267db686f7d8181c499f17' + '465dd984f2f96407213c174ec832e51d' + 'aade2355978099d9fc25d0aebb3add7f' + 'c66934fca336e18aa90938b0bc5991d7' + 'cc128b35d45e14047f769ee6f0c7af76' + '2357b049d7a7eb241b1a86f359aaa576' + '78f9371eb4c4c48a9ecd35f9e5c90461' + '9c06a7d81fb49995b56a3dfb4c77db9d' + '4af51a779abaa49a6bae6b90ccdb3fd8' + '3ee205c981dcc548f3e501aa06167df4') 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 240c3d4e8..a5fe02165 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 @@ -139,7 +139,7 @@ index 21cf405..f3c1a6b 100644 <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index ab82d85..915f6b8 100644
+index 260bc29..52b32cc 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
@@ -8,7 +8,6 @@ profileName_format=%S %S
@@ -150,7 +150,7 @@ index ab82d85..915f6b8 100644 importedBookmarksFolder=From %S
-@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari)
+@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
2_ie=Cookies
2_safari=Cookies
2_chrome=Cookies
@@ -177,25 +177,25 @@ index ab82d85..915f6b8 100644 32_ie=Favorites
32_safari=Bookmarks
-@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari)
+@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
64_ie=Other Data
64_safari=Other Data
64_chrome=Other Data
-64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 697b217..b6e1709 100644
+index 339ffda..6999b26 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -38,7 +38,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
- *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
-* content/global/resetProfile.js (resetProfile.js)
+ content/global/resetProfile.js (resetProfile.js)
- * content/global/resetProfile.xul (resetProfile.xul)
- * content/global/resetProfileProgress.xul (resetProfileProgress.xul)
- * content/global/treeUtils.js (treeUtils.js)
+ content/global/resetProfile.xul (resetProfile.xul)
+ content/global/resetProfileProgress.xul (resetProfileProgress.xul)
+ content/global/treeUtils.js (treeUtils.js)
diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
index dcb4065..09c1146 100644
--- a/toolkit/content/resetProfile.js
@@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e5d3042..6de3390 100644
+index 60348b5..c240c4f 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun()
+@@ -3651,7 +3651,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 c2bb0cab6..ea048d500 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=15.0.1 +_debver=16.0.1 _debrel=1 [ "$CARCH" == "mips64el" ] && { _debver=13.0.1; _debrel=2; } _debrepo=http://ftp.debian.org/debian/pool/main/ @@ -53,16 +53,16 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('0936242388cd4c75930c1d2487e15216' - 'ce37c76476b8edf40780d00cf79d0d62' +md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3' + 'ddfcf225ea0e3d7b4b377f4a63d5e8c4' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '6d8816d2577263556d76f1aa4527b55b' - 'e529742c0a425648087bc3ce537fe4c5' + '8768dfc39e9f1057c2956bf4405ae58e' + 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' - 'c52fac65c1e06290a5108b75c31ace79') + '0a31239f1008038df5057982fe745dec') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch index f80a3eca9..a44aef496 100644 --- a/libre/iceweasel-libre/iceweasel-install-dir.patch +++ b/libre/iceweasel-libre/iceweasel-install-dir.patch @@ -1,28 +1,31 @@ -diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in ---- iceweasel-9.0.1.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500 -+++ iceweasel-9.0.1/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500 -@@ -68,8 +68,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk +--- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200 ++++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200 +@@ -1,10 +1,10 @@ + INCLUDED_AUTOCONF_MK = 1 --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION))) +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in ---- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500 -+++ iceweasel-9.0.1/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500 -@@ -60,8 +60,8 @@ - datadir = @datadir@ - mandir = @mandir@ + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk +--- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200 ++++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - TOP_DIST = @TOP_DIST@ ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 9ffaf3a9a..7e7b7290f 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,7 @@ -diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js ---- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300 -+++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300 -@@ -64,11 +64,11 @@ +diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js +--- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300 ++++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200 +@@ -37,11 +37,11 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); @@ -18,16 +18,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -92,7 +92,7 @@ - pref("extensions.autoDisableScopes", 15); - - // Dictionary download preference --pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "about:blank"); - - // The minimum delay in seconds for the timer to fire. - // default=2 minutes -@@ -218,7 +218,7 @@ +@@ -194,7 +194,7 @@ pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day // Non-symmetric (not shared by extensions) extension-specific [update] preferences @@ -36,25 +27,16 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next // restart. -@@ -252,7 +252,7 @@ - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session - // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore - pref("browser.startup.page", 1); --pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.startup.homepage", "about:home"); - - // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into - // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -@@ -345,7 +345,7 @@ - pref("browser.download.manager.resumeOnWakeDelay", 10000); +@@ -327,7 +327,7 @@ + pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL -pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); -+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -@@ -593,7 +593,7 @@ +@@ -584,7 +584,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD new file mode 100644 index 000000000..57488f6de --- /dev/null +++ b/libre/linux-libre-firmware/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: André Silva <emulatorman@lavabit.com> +# Contributor: Márcio Silva <coadde@lavabit.com> + +pkgname=linux-libre-firmware +pkgver=3.6 +pkgrel=2 +pkgdesc='Free firmware files for Linux-libre' +arch=('any') +url='http://linux-libre.fsfla.org/' +license=('GPL2') +provides=('linux-firmware=20120625' + 'kernel26-firmware=2.6.34.99') +conflicts=('linux-firmware' + 'linux-firmware-git' + 'kernel26-firmware' + 'ar9170-fw' + 'iwlwifi-1000-ucode' + 'iwlwifi-3945-ucode' + 'iwlwifi-4965-ucode' + 'iwlwifi-5000-ucode' + 'iwlwifi-5150-ucode' + 'iwlwifi-6000-ucode' + 'rt2870usb-fw' + 'rt2x00-rt61-fw' + 'rt2x00-rt71w-fw') +replaces=('linux-firmware' + 'kernel26-firmware' + 'ar9170-fw' + 'iwlwifi-1000-ucode' + 'iwlwifi-3945-ucode' + 'iwlwifi-4965-ucode' + 'iwlwifi-5000-ucode' + 'iwlwifi-5150-ucode' + 'iwlwifi-6000-ucode' + 'rt2870usb-fw' + 'rt2x00-rt61-fw' + 'rt2x00-rt71w-fw') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") +md5sums=('a2312edd0265b5b07bd4b50afae2b380') + +package() { + cd $srcdir/linux-$pkgver + + make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install + + # move WHENCE file to linux-libre-firmware license folder + install -d -m755 $pkgdir/usr/share/licenses/$pkgname + mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname +} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index ec283afce..4feb1ac6f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -154,7 +154,7 @@ build() { _package() { pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('coreutils' 'kmod') + depends=('coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9176015b9..b17744237 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -29,9 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'alsa-powersave-3.5.x.patch' - 'watchdog-3.5.x.patch' - 'i915-i2c-crash-3.5.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' '62d272c8ec79bd2eb9cc56001aaf1042' @@ -146,7 +143,7 @@ build() { _package() { pkgdesc="The ${pkgbase} kernel and modules" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('coreutils' 'kmod') + depends=('coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index e8f6ff5a1..d4d91c412 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=30 +pkgrel=31 epoch=1 -_extramodules=extramodules-3.5-LIBRE +_extramodules=extramodules-3.6-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -56,7 +56,7 @@ build() { package_lirc-libre() { pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" - depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5') + depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index b39282da6..976f5ab8a 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.5-LIBRE +EXTRAMODULES=extramodules-3.6-LIBRE post_install() { # updating module dependencies diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 7a95abd0b..9d77543ce 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=20120816 +pkgver=20121012 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -16,5 +16,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('4163ebfce3ccc32e2398e18c19158fc1' - 'b4b1b532657eb754ef2e9f7cf4d0a09a') +md5sums=('386550a6b179ebd158bc7469362bf0b8' + '4794d17dd40d51069eca315c2243528b') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 19d1b8908..4c8910c2b 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,13 +11,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=11 +pkgrel=9 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' license=('GPL') -depends=('linux-libre>=3.5' 'linux-libre<3.6') -makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6') +depends=('linux-libre>=3.6' 'linux-libre<3.7') +makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 5fe1bab90..3662e7f34 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.5-ARCH +extramodules=/usr/lib/modules/extramodules-3.6-ARCH post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 74209d64b..7405eb52f 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -2,17 +2,18 @@ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 -_extramodules=extramodules-3.5-LIBRE -pkgrel=11 +_extramodules=extramodules-3.6-LIBRE +pkgrel=12 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.5' 'linux-libre<3.6') +depends=('linux-libre>=3.6' 'linux-libre<3.7') makedepends=('linux-libre-headers') options=(!makeflags) install=$_pkgname.install diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index b2a49a261..8bd740943 100644 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,6 @@ _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 270e14af9..3bd4616eb 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.0 -pkgrel=5.3 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -32,15 +32,14 @@ build() { package_virtualbox-libre-host-modules(){ pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre>=3.5' 'linux-libre<3.6') + depends=('linux-libre>=3.6' 'linux-libre<3.7') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - #_extraver=extramodules-${_kernver%.*}-LIBRE - _extraver=extramodules-3.5-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" @@ -52,15 +51,14 @@ package_virtualbox-libre-host-modules(){ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel libre modules for VirtualBox' license=('GPL') - depends=('linux-libre>=3.5' 'linux-libre<3.6') + depends=('linux-libre>=3.6' 'linux-libre<3.7') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - #_extraver=extramodules-${_kernver%.*}-LIBRE - _extraver=extramodules-3.5-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index c3419c991..caf59aa13 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.5-LIBRE' + EXTRAMODULES='extramodules-3.6-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |