diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-03-08 07:59:53 -0600 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-03-08 07:59:53 -0600 |
commit | da77e97d913dbb6efcd544f57b8b6e58c43f6442 (patch) | |
tree | 83524e87b4577872ac43a67770de0cedc3a1f8bb /libre | |
parent | cea19ccf7318073acb582d4817fafdb123d5b7fc (diff) | |
parent | 61733e7ff1a756e9325154d9d52cdcdeb27d9097 (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'libre')
23 files changed, 735 insertions, 155 deletions
diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD new file mode 100644 index 000000000..9f5ef223b --- /dev/null +++ b/libre/apache-ant-libre/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer (Arch): Paul Mattal <paul@archlinux.org> +# Contributor: Andrew Wright <andreww@photism.org> + +_pkgname=apache-ant +pkgname=apache-ant-libre +pkgver=1.8.2 + +provides=("$_pkgname=$pkgver") +replaces=("$_pkgname") +conflicts=("$_pkgname") + +pkgrel=3 +pkgdesc="A java-based build tool" +arch=('any') +license=('APACHE') +url="http://ant.apache.org/" +depends=('java-environment') +makedepends=('junit') +optdepends=('junit: to have JUnit on the classpath in javac tasks') +source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2 + ${_pkgname}.sh ${_pkgname}.csh + ant_diagnostics.patch) + +build() { + # This directory is what becomes + # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 + # which is what Arch uses + rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin + mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin + + cd "${srcdir}"/${_pkgname}-${pkgver} + ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional + sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist +} + +package() { + # install profile.d script + install -dm755 "${pkgdir}"/etc/profile.d + install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/ + + # Get the ANT_HOME env var + source "${srcdir}"/${_pkgname}.sh + + cd "${srcdir}"/${_pkgname}-${pkgver}-bin + install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib} + + install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib + cp -Rp ./etc "${pkgdir}"/${ANT_HOME} + + # Do not copy Windows .bat/.cmd files + find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \; + + # symlink to junit so it's on the javac build path for ant + # matches behavior on ubuntu 9 and makes sense for compatibility + # http://bugs.archlinux.org/task/15229 + ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/ + + # fix python2 path + sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py + + # The license says the NOTICE file should be redistributed for derivative + # works, so lets supply it. + cd "${srcdir}"/${_pkgname}-${pkgver} + install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname} + install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname} +} + +md5sums=('0d9e108afcd15b820150b8085c96d2b1' + '593ee6ebd9b8ec321534a028e686880f' + '475b684eb8202c09cbb51496cd8ee1e0' + 'cbaab423be40a6e63f0fde901b91eb50') diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch new file mode 100644 index 000000000..38148b45c --- /dev/null +++ b/libre/apache-ant-libre/ant_diagnostics.patch @@ -0,0 +1,23 @@ +--- a/src/main/org/apache/tools/ant/Diagnostics.java ++++ b/src/main/org/apache/tools/ant/Diagnostics.java +@@ -179,7 +179,10 @@ + * @param clazz the class to get the information from.
+ * @since Ant 1.8.0
+ */
+- private static URL getClassLocation(Class clazz) {
++ private static URL getClassLocation(Class clazz) { ++ if (clazz.getProtectionDomain().getCodeSource() == null) { ++ return null; ++ }
+ return clazz.getProtectionDomain().getCodeSource().getLocation();
+ }
+
+@@ -241,7 +244,7 @@ + }
+ Transformer transformer = null;
+ try {
+- transformer = transformerFactory.newTransformer();
++ transformer = transformerFactory.newTransformer(); + } catch (Exception e) {
+ // ignore
+ ignoreThrowable(e);
diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh new file mode 100644 index 000000000..b6a6d5840 --- /dev/null +++ b/libre/apache-ant-libre/apache-ant.csh @@ -0,0 +1,2 @@ +setenv ANT_HOME /usr/share/java/apache-ant +setenv PATH ${PATH}:${ANT_HOME}/bin diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh new file mode 100644 index 000000000..ab602fb28 --- /dev/null +++ b/libre/apache-ant-libre/apache-ant.sh @@ -0,0 +1,3 @@ +export ANT_HOME=/usr/share/java/apache-ant +export PATH=$PATH:$ANT_HOME/bin + diff --git a/libre/icecat-i18n/.directory b/libre/icecat-i18n/.directory new file mode 100644 index 000000000..98ec279ed --- /dev/null +++ b/libre/icecat-i18n/.directory @@ -0,0 +1,2 @@ +[Dolphin] +Timestamp=2012,3,2,21,19,19 diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile new file mode 100644 index 000000000..d1aaf7bff --- /dev/null +++ b/libre/icecat-i18n/Makefile @@ -0,0 +1,38 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - grep +# - pacman +# - sed +# - wget + +# Variables: +_pkgver=10.0 +pkgver=10.0 +pkgrel=1 + +# Guts: ############################################################## + +default: PHONY all +all: PHONY PKGBUILD + +index.html: Makefile + rm -f $@ + wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ +langpacks.txt: index.html Makefile + egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ +PKGBUILD: PKGBUILD.in langpacks.txt Makefile + sed \ + -e 's/@_PKGVER@/$(_pkgver)/' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ + -e '/md5sums/,$$d' \ + PKGBUILD.in > $@ + makepkg -dg >> $@ + +clean: PHONY + rm -f index.html langpacks.txt *.xpi + +.PHONY: PHONY FORCE diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index 36a55c0e6..f995939da 100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD @@ -1,23 +1,24 @@ -# Maintainer: fauno <fauno@kiwwwi.com.ar> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> +# Contributor: emulatorman <andre.paulista@adinet.com.uy> # Based on firefox-i18n package # When updating to a newer upstream release: -# - run the two commands below to get list of language packs -# - change version in pkgver and _path -# - replace md5sums with output of makepkg -g +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. -# wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ -# echo $(egrep -o '[^>".]+\.xpi' index.html | sort -u | sed 's/\.xpi//') _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) pkgbase='icecat-i18n' pkgname=($(for lang in ${_langpacks[@]} do echo icecat-i18n-$lang | tr A-Z a-z done)) -pkgver=6.0 -pkgrel=2 -pkgdesc="Language packs for IceCat" +_pkgver=10.0 +pkgver=10.0 +pkgrel=1 +pkgdesc="Language packs for GNUzilla IceCat." arch=('any') license=('MPL') url="http://www.gnu.org/software/gnuzilla/" @@ -33,95 +34,97 @@ build() { cd "${srcdir}" } -_path="/usr/lib/icecat-6.0/extensions/" +_path="/usr/lib/icecat-$_pkgver/extensions/" for lang in ${_langpacks[@]} do - eval 'package_icecat-i18n-'$(echo $lang | tr A-Z a-z)'() { - install -Dm644 "'"$srcdir/$lang.xpi"'" "${pkgdir}'"${_path}langpack-$lang@firefox.mozilla.org.xpi"'" -}' + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" done -md5sums=('591c7337853eedb77b86dede0c5bdf54' - '2b0c067f8387fb582b419dfca57d422e' - 'f3f6870d4b01bd64d80ac4de1db513f0' - 'd4f56954f7ad955481bda5503ecbc512' - '765d3c03355029434bbb65d121f67089' - '9e079762110ad2fcedc993bb87c44963' - '66a95194e65db2153e594fab871f5cd3' - '6ee12336d42c9ff23ec2b7864f44e38f' - '945f3c38961572b12148bc4f1c8bd283' - '9325c0178bff267cf4bb0583cf1d6c36' - '72c776ab5cd92cbaf7e3bda8d6f0d0d5' - '3e2a8386e6c56808a38ea749fd06d796' - '8a44d5a3c358bc510feccf917879baea' - '73574a44a75d52cfab87c3e10b2ebbb1' - '7486a690a30f348f07a2fec8478f3d1d' - '4c41dc44ff3e3b64e5a15aa2c1184660' - '6fde110c1244662eaf31d517ae2c9690' - 'b37ce2233807458f5b3835114f04c6df' - '8fa56995459873b5dcd03b06ee4a179c' - 'bfe86fdf0111d7d7d02fb689e197bdd3' - 'e97fe3f85ac1fc9c1c61edd56527ab25' - '5a51f4072f1c7f43832ac1c41a7135fd' - 'b13e8d2e54bbe35f9da43239cb4a2a16' - '71dd0c6257b419f986127db2600851a7' - '80a081a31a991fa63af8c26aebbaf8b3' - 'db7a91026ba03d4bfaadf23c4508ecf2' - 'a839ad07724553aefb76aa48c988ca3f' - 'b1e6859da4b078530fa00783c2fc8621' - '40abf8376133162a9f7c7ec44e5e06e6' - 'c4f62ffabe72ae87a096025998887bf9' - '1f58d2fbbaf449b4e05a83feddaa7f4e' - '9a54443791d8aa7004d085d79e4db1ea' - '948138c58a07b5fcb5c254bca5399e22' - '8889732de77e9e51bb43c744300a8b10' - 'fcc0c92d1c1aae27881cba21cd81d15c' - 'df3946f758bed44d30068bda21aa1af5' - 'e8b8fbc055f64c0b23a1c5c0ff21c603' - 'b358b06641cdfff8c8c500679aa632d3' - 'f7e67fa44a737f9b3a80abb9c3915ce5' - '2ee78734669c9e92a103db8c41614cca' - 'c0605e37d16869969b37b5936e28ff5e' - '51371731e61bc1369f47fd9ef263c63e' - '37eeb62381928a226472a916fec56844' - 'a22816fda39678927ca34437da1519b9' - 'd5910852f9ff4e142b5ad124f2135e59' - '3cbe3eb40bb57e6ff11d6377d966a8fc' - '64ce138c00140e553689d4265f018898' - 'c37d831b598ac6e5b0e3e49ec605ff7b' - '546deebbe1f27122ff21fbe85dd9ecfd' - '1bcacee0782d62298883426a41830531' - '69584792a5d7eba4ff80e85456d647c6' - '4515b31f20fd2f20bce55f4a1f6c0ec8' - '6357aeaf62d7867506c20b38bd2478a3' - '54da09a50365fea562b804b4cf2be2c4' - '0a8750cc238982882c7872edf2989341' - '136d2c2b747e7227207ed7dbb79b294e' - '43ae45dae8693c119a8cf703a0bb132a' - '3627b7ab8670a3741a48786df22ed2c0' - 'e4d3db69c334d1021b1982ab87a10d42' - '31c7e16225a379dc1fdabc211cd99079' - '142e02f1ab3db4f97b37adbf4e3a9138' - '617e895568a02588a168c54347f372e6' - '093b71d87d5e04311dab30b7a566d708' - 'e30278d7ac6ca5d09cb688420a221cc0' - '3ba61614b3ddbcf3dda18279e199afcd' - 'eaa1f41fa0ed45a5a3a0ab5b7b9e49d5' - '62999792ecd62689855651082d19d167' - '05a46c2dd966fd666f13e8db06441cf3' - 'fdf997b09ab54da41fccc590dba5201e' - 'bac1fc01d3bede7b4bb14a2290c33040' - '08c12984597bbe198329378fc59bacfb' - '587cb4938f8eac86e7ad05e7be4b0f9a' - '84914182cdb315e1a3a2062993f5cc00' - '15abeab9563a56bb0a061714f94bb1c5' - '05b190869d198992fda1624feb216a09' - '5885e96955025acf86f4186aaba5b794' - '37bddedad6898bac58987effeccadfad' - '49c0fbe9e0cbf66e24919eb99a612a43' - '9333d449ddbc8a3463d5aabacef39956' - 'ede65b0a4ba01afc53ba8035dc6a054c' - 'fe40e393535cc3106041592b626995f7' - 'a5941ca6a2271e0e1b4de3f9e7df5571' - '84da1f02c05066fe779e4813befc062e') +md5sums=('6d4c69921bbdfe92c0fd31873983d426' + '4e994c70c93e4d266d273d2358f7acf3' + 'd783c592edfa96d6abecd1efa1aa1b5e' + '70b8badcddb6d5cf6b226c0f0141b463' + 'bcfe52114b1c0f5346594452117bec5d' + '7d8900839fcf5972a91c4ce1a1bdd7c6' + 'd9720bf726a8f6fde0dc94e6e73863a9' + 'ce61734ab226dc041b55e95c9b6f9d92' + '965c2ec576ac41e7351e159f516ec65f' + '4feb78e0dd79606f416b8ab46432ad41' + '61989146fe89320c847e4de6261a06ff' + '260f3abb8612248493060e2dec6f0a22' + '6b49d830c47717001250236c9cc933a5' + '338137d425c8e6ae98796f3cc9a0550f' + '4ddf33cc1af9d3ad483d8fc47609aee3' + 'e04918865a21260b8eaf27b3dc84ade5' + '59961e347c4fe3816f809f456bc9a2b8' + '262ad46f6c6e8a89eb29b590cc092eb9' + 'e9452d83d914605f06c055c00325bf6b' + 'ae652d7db9b3cd3cba85306d16a7a599' + '04fec5cd927a57ac6c9780a9f42444e1' + '70ba3ec972f01e75b144e106afacd8ac' + 'f1ee7deccf3c73083b51c5741722b120' + 'ca5566a24ee4fd38a3a907bfb5d72975' + 'd4717e5c3e44fbaebe4eaf99f0195120' + '907c42bdaa3af02c39bef5d83198f8a9' + '7afa1ac8645657722cdf3415244e4686' + 'd3d780b6c8d179c68065d9bec19dce48' + '09fae6ea53f5435ccfdbf41f660378ee' + '043306182ec497280b3ea78dcbd7b7d3' + '8a481d0d41f22d5bc65ed7844a0d7c27' + '2a8648998f2aafd307511e043cd8564d' + 'e7fbc4b7364d151edac9840b90949f56' + 'e2ea49277375825f612bcfb225dcb0a0' + '9fb2a20a2222a0d814a3f48d7208d820' + '88976bac6b9e647f4d17ab1638f12601' + 'a6a39406914459deaefb3403e94dfa39' + 'd3acecff63909d946fb549520785ef99' + 'a8327a1a525330ca9ef8e3f9d50ca5f8' + 'ba3ad9e8843b0de408a72896183985d6' + '3dfb48ecea5eda9f0e3e05295eb3c82b' + '95a1e7e2ec604409b54f1ded4ee7accf' + '69ebeb59c7ff4e0452c9f0998db65ef0' + '7bdf97288cef0d14ff1521db063cd20c' + '8f50cfa1e8c788b7b839273848dc2834' + '3aa0631dc6a53581cf53d559b27a0ee3' + '45e7238e0d0e427df04d3ba91ca045cd' + 'b992cfa2b0440486cd70fd6ab9e32deb' + '3a9fac821e039556f7d009080daec643' + '6872abed4f4d4b81cf5f0b7b656846c7' + 'eb44e902c6a6186c85dca8aff1d5b95f' + '21f5aeacbb233167218ab7f1b34efdce' + 'b97e29d866ae1ed422d0a1c4327cfd49' + '5cce41015e73c36944224f827ac5a8d1' + 'a13ac7293acc75015f0034d77ddb0f30' + '38c84e214af65ed6f059ad524c923dc9' + '66c8d82875f55f67167048e3d6888d8f' + '4ec423b8e34a4de058b115fd5918e0b2' + '0026e20db1bad1eaf692bd0b2043c038' + '31f029a6665ccae9b4c8cac9eda06c6f' + 'e72ffe020543ca0ad4f8be2aad9e90a9' + '7b75e8fb1cd8ae34023b312d2214029a' + '88b1a96268e08f65579b2fe6d7677b73' + '4418d687e4dcb313fd59247844eab93c' + 'b200a045163b7c09cde85b82013fec98' + '263f6ff19491b68865bcab4309dff0a8' + '80d0fb352eb1f252c355d3b8388d3513' + 'dd79b0c4d959f46852e1e23b0cc984af' + 'db51a6767331bb3a8c0a1e0f5f35d968' + '3155d4cafe5f90ec83336ddd07183629' + 'b9246693498e1ec3c5b4dffa8145d04e' + '770bf78f2a0c6522e641e61e44617b40' + 'aadf3a6f9517c76e2b37867cb1a654c6' + '3530c75b3c2311d8127f20df7bd724da' + 'ef3bfc5db8197edb095da10390d8e058' + '46b701b2db7415b30b82023bb707e1dc' + '24da3bee4042e31da5781b02dc089499' + 'b3faadcabfd6d738a41ee4c12696adcd' + '9938f231ce13202d040c24783c95c35b' + '04894f460b81525d29367f1ed1504f5e' + 'c6049613b48eaaa71c45df2e44db1087' + '7e7e81ca9c6d44913d37159b4627967c' + '1a80a20da9cc26e2edd942d77a35c824') diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in new file mode 100644 index 000000000..90c901e31 --- /dev/null +++ b/libre/icecat-i18n/PKGBUILD.in @@ -0,0 +1,46 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Based on firefox-i18n package + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_langpacks=@LANGPACKS@ + +pkgbase='icecat-i18n' +pkgname=($(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done)) +_pkgver=@_PKGVER@ +pkgver=@PKGVER@ +pkgrel=@PKGREL@ +pkgdesc="Language packs for GNUzilla IceCat." +arch=('any') +license=('MPL') +url="http://www.gnu.org/software/gnuzilla/" +depends=("icecat=${pkgver}") +source=($(for lang in ${_langpacks[@]} + do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi + done)) +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" +} + +_path="/usr/lib/icecat-$_pkgver/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD new file mode 100644 index 000000000..9f42e977d --- /dev/null +++ b/libre/java-asm2/PKGBUILD @@ -0,0 +1,74 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=asm +pkgname=java-asm2 +pkgver=2.2.3 +pkgrel=1 +pkgdesc="An all purpose Java bytecode manipulation and analysis framework." +arch=('any') +url="http://asm.ow2.org/" +license=('custom:BSD3') +depends=('java-runtime') +makedepends=( + apache-ant + java-ow-util-ant-tasks +) +source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + mkdir -p test/lib + echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties + ant dist +} + +mvn-install() { + group=$1 + pkg=$2 + ver=$3 + + dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver + install -d "$dir" + cp $pkg-$pkgver.* "$dir" +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + # Install license file + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # Install documentation + cd output/dist + install -d "$pkgdir/usr/share/doc/$pkgname" + cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc" + cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples" + + # Install Apache Maven modules + cd lib + mvn-install asm asm $pkgver + mvn-install asm asm-analysis $pkgver + mvn-install asm asm-attrs $pkgver + mvn-install asm asm-commons $pkgver + mvn-install asm asm-tree $pkgver + mvn-install asm asm-util $pkgver + mvn-install asm asm-xml $pkgver + cd all + mvn-install asm asm-all $pkgver + + # Synlink Maven modules to /usr/share/java + install -d "$pkgdir"/usr/share/java/asm + cd "$pkgdir" + find usr/share/maven/repository/asm \ + -type f -name '*.jar' -printf '/%p\n' | while read jar; do + ln -s "$jar" "$pkgdir"/usr/share/java/asm + done + + # Put the finishing touches on /usr/share/java + ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-2.jar + cd "$srcdir/$_pkgname-$pkgver" + install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt +} + +md5sums=('7a92c87bf067925685cf68dcc0dd8998') diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD new file mode 100644 index 000000000..2c6a7f933 --- /dev/null +++ b/libre/java-asm3/PKGBUILD @@ -0,0 +1,83 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=asm +pkgname=java-asm3 +pkgver=3.3.1 +pkgrel=3 +pkgdesc="An all purpose Java bytecode manipulation and analysis framework." +arch=('any') +url="http://asm.ow2.org/" +license=('custom:BSD3') +depends=('java-runtime') +makedepends=( + apache-ant + java-ow-util-ant-tasks +) +source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + rm cobertura.ser # We regenerate this + rm examples/jasmin/test/jasmin.jar + + echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties + ant dist +} + +# Tests have more dependencies, and I can't be bothered to package them. +#check() { +# cd "$srcdir/$_pkgname-$pkgver" +# ant test +#} + +mvn-install() { + group=$1 + pkg=$2 + ver=$3 + + dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver + install -d "$dir" + cp $pkg-$pkgver.* "$dir" +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + # Install license file + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # Install documentation + cd output/dist + install -d "$pkgdir/usr/share/doc/$pkgname" + cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc" + cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples" + + # Install Apache Maven modules + cd lib + mvn-install asm asm $pkgver + mvn-install asm asm-analysis $pkgver + mvn-install asm asm-commons $pkgver + mvn-install asm asm-parent $pkgver + mvn-install asm asm-tree $pkgver + mvn-install asm asm-util $pkgver + mvn-install asm asm-xml $pkgver + cd all + mvn-install asm asm-all $pkgver + mvn-install asm asm-debug-all $pkgver + + # Synlink Maven modules to /usr/share/java + install -d "$pkgdir"/usr/share/java/asm + cd "$pkgdir" + find usr/share/maven/repository/asm \ + -type f -name '*.jar' -printf '/%p\n' | while read jar; do + ln -s "$jar" "$pkgdir"/usr/share/java/asm + done + + # Put the finishing touches on /usr/share/java + ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-3.jar + cd "$srcdir/$_pkgname-$pkgver" + install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt +} + +md5sums=('433024df8176f09922646316e415631c') diff --git a/libre/java-ow-util-ant-tasks/PKGBUILD b/libre/java-ow-util-ant-tasks/PKGBUILD new file mode 100644 index 000000000..023048188 --- /dev/null +++ b/libre/java-ow-util-ant-tasks/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=java-ow-util-ant-tasks +pkgver=1.3.2 +pkgrel=1 +pkgdesc="ObjectWeb utility Ant tasks library" +arch=('any') +url="http://forge.ow2.org/projects/monolog" +license=('LGPL') +depends=('java-environment') +makedepends=('apache-ant' 'xalan-java' 'java-asm2') +source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + ln -s /usr/share/java/asm-2.jar externals + ln -s /usr/share/java/xalan.jar externals + ant jar +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir"/usr/share/java + install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java +} + +md5sums=('339b3eb4b2960473a42f5f781afbeca6') diff --git a/libre/java-ow-util-ant-tasks/SRCBUILD b/libre/java-ow-util-ant-tasks/SRCBUILD new file mode 100644 index 000000000..01241907d --- /dev/null +++ b/libre/java-ow-util-ant-tasks/SRCBUILD @@ -0,0 +1,29 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=java-ow-util-ant-tasks +pkgver=1.3.2 +pkgrel=1 +pkgdesc="ObjectWeb utility Ant tasks library" +arch=('any') +url="http://forge.ow2.org/projects/monolog" +license=('LGPL') +source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip") +noextract=("ow_util_ant_tasks_$pkgver.zip") + +build() { + cd "$srcdir" + mkdir $pkgname-$pkgver + cd $pkgname-$pkgver + bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip + rm -rf output + rm externals/* +} + + +package() { + PKGEXT=${SRCEXT} + PKGDEST=${SRCDEST} + cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/" +} + +md5sums=('cd602bf75a0feab480fa97739955b84e') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 0c9e95b83..63463cc0a 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -8,7 +8,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.0 -pkgver=${_basekernel}.22 +_sublevel=23 +pkgver=${_basekernel}.${_sublevel} +_lxopkgver=${_basekernel}.22 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -17,7 +19,6 @@ makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -27,10 +28,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'ext4-options.patch') + 'ext4-options.patch' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - 'ddc0925df01b70f6eef95e9b4160f28a' - '248d057fd2341d315ada5e844cdbdc1f' + '5b6f929403ddad35a65b934ed5df2f8a' '054af37f538b74a8090fc3e783a2edfa' 'e195768d5b8cbe788dbe615561d4314f' 'd2c0701480bce49fd4b40dc46b9863f1' @@ -39,7 +40,13 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '74d2b710d6c97aee441d7566f8f68815') + '74d2b710d6c97aee441d7566f8f68815' + '248d057fd2341d315ada5e844cdbdc1f') +if [ "$CARCH" != "mips64el" ]; then + # Don't use the Loongson-specific patches on non-mips64el arches. + unset source[${#source[@]}-1] + unset md5sums[${#md5sums[@]}-1] +fi build() { cd "${srcdir}/linux-${_basekernel}" @@ -71,16 +78,22 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ + < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i "${srcdir}/lxo-config.patch" + patch -Np0 -i lxo-config.patch -# ensure N32, add localversion and remove uevent helper as per +# ensure N32, add localversion, remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README - sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ +# and make USB storage support builtin (e.g. for booting from USB +# disks without slowly loading an initramfs) + sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ - -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \ + -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ + ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi @@ -114,7 +127,12 @@ build() { # build! if [ "$CARCH" == "mips64el" ]; then - make ${MAKEFLAGS} vmlinuz modules + # The build system passes it directly to linker, disable to avoid + # having unknown -Wl,... options. + export LDFLAGS="" + # bzImage is arch-specific and not supported on mips; vmlinux is + # useful for oprofile. + make ${MAKEFLAGS} vmlinux vmlinuz modules else make ${MAKEFLAGS} bzImage modules fi @@ -123,13 +141,19 @@ build() { package_linux-libre-lts() { pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers" groups=('base') - depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'module-init-tools>=3.16') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26-lts' "linux-lts=$pkgver") conflicts=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts') replaces=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install + if [ "$CARCH" = "mips64el" ]; then + optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') + conflicts+=('mkinitcpio<0.7') + else + depends+=('mkinitcpio>=0.7') + fi cd "${srcdir}/linux-${_basekernel}" @@ -144,6 +168,7 @@ package_linux-libre-lts() { if [ "$CARCH" == "mips64el" ]; then cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}" + cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}" else cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}" fi @@ -195,7 +220,7 @@ package_linux-libre-lts-headers() { # In case of repackaging this is empty if [ -z "${_kernver}" ]; then - cd ${srcdir}/linux-$pkgver + cd "${srcdir}/linux-${_basekernel}" _kernver="$(make kernelrelease)" fi @@ -229,7 +254,7 @@ package_linux-libre-lts-headers() { if [ "$CARCH" = "mips64el" ]; then cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" fi diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 6cf57ce44..2de3804e6 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.22-1-LIBRE-LTS +KERNEL_VERSION=3.0.23-1-LIBRE-LTS post_install () { # updating module dependencies @@ -17,8 +17,9 @@ post_install () { [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then # add compat symlinks for the initramfs images - ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img - ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img + ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img + ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \ + boot/kernel26${KERNEL_NAME}-fallback.img ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} fi fi diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3cb6108d5..5b8430f86 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -4,14 +4,17 @@ # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.7 -pkgrel=1 +_sublevel=9 +pkgver=${_basekernel}.${_sublevel} +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -19,7 +22,6 @@ makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,19 +31,27 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch') + 'i915-gpu-finish.patch' + 'ext4-options.patch' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '37a0fdc7ad19c9489faf09925b4fae5b' - '690e6201d219638544d2fba3996dc822' - '79db8a444fd149e409f706830d8cee9a' - 'e26dbcb367a2b48f5ed09560e2ae8fa0' + '8e601878ccdd37111cc84500ebd81387' + '921f108c7a4985f7f8b41d72ca9bf915' + 'f18ac3f790b0daa43f21dda04cceb90b' 'a8a3843046926eb7ab81312cd438c5c5' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') + '4cd79aa147825837dc8bc9f6b736c0a0' + 'f36222e7ce20c8e4dc27376f9be60f6c' + '690e6201d219638544d2fba3996dc822') +if [ "$CARCH" != "mips64el" ]; then + # Don't use the Loongson-specific patches on non-mips64el arches. + unset source[${#source[@]}-1] + unset md5sums[${#md5sums[@]}-1] +fi build() { cd "${srcdir}/linux-${_basekernel}" @@ -71,21 +81,28 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ + < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i "${srcdir}/lxo-config.patch" + patch -Np0 -i lxo-config.patch -# ensure N32, add localversion and remove uevent helper as per +# ensure N32, add localversion, remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README - sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ +# and make USB storage support builtin (e.g. for booting from USB +# disks without slowly loading an initramfs) + sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ - -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config - - sed -e "s|# \(CONFIG_BATMAN_ADV\) is not set|\1=m\n\1_DEBUG=n|" \ - -i ./.config + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \ + -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ + ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi @@ -119,7 +136,12 @@ build() { # build! if [ "$CARCH" == "mips64el" ]; then - make ${MAKEFLAGS} vmlinuz modules + # The build system passes it directly to linker, disable to avoid + # having unknown -Wl,... options. + export LDFLAGS="" + # bzImage is arch-specific and not supported on mips; vmlinux is + # useful for oprofile. + make ${MAKEFLAGS} vmlinux vmlinuz modules else make ${MAKEFLAGS} bzImage modules fi @@ -128,13 +150,19 @@ build() { package_linux-libre() { pkgdesc="The Linux-libre Kernel and modules" groups=('base') - depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'module-init-tools>=3.16') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=$pkgver") conflicts=('kernel26' 'kernel26-libre' 'linux') replaces=('kernel26' 'kernel26-libre' 'linux') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install + if [ "$CARCH" = "mips64el" ]; then + optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') + conflicts+=('mkinitcpio<0.7') + else + depends+=('mkinitcpio>=0.7') + fi cd "${srcdir}/linux-${_basekernel}" @@ -149,6 +177,7 @@ package_linux-libre() { if [ "$CARCH" == "mips64el" ]; then cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}" + cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}" else cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}" fi @@ -200,7 +229,7 @@ package_linux-libre-headers() { # In case of repackaging this is empty if [ -z "${_kernver}" ]; then - cd ${srcdir}/linux-${_basekernel} + cd "${srcdir}/linux-${_basekernel}" _kernver="$(make kernelrelease)" fi @@ -234,8 +263,7 @@ package_linux-libre-headers() { if [ "$CARCH" = "mips64el" ]; then cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -r "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -r "arch/${KARCH}/loongson1" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" fi diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index d2d688197..5a50c4e04 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -4053,7 +4053,7 @@ CONFIG_FB_I810_I2C=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 80ea3030f..441d23e6f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -3880,7 +3880,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/libre/linux-libre/ext4-options.patch b/libre/linux-libre/ext4-options.patch new file mode 100644 index 000000000..ef1b2417d --- /dev/null +++ b/libre/linux-libre/ext4-options.patch @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen <teg@jklm.no> +Cc: Thomas Baechler <thomas@archlinux.org> +Cc: Tobias Powalowski <tobias.powalowski@googlemail.com> +Cc: Dave Reisner <d@falconindy.com> +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" " diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6e3e16986..ea00c881c 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,14 +2,16 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.2.7-1-LIBRE +KERNEL_VERSION=3.2.9-1-LIBRE post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then @@ -50,8 +52,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD new file mode 100644 index 000000000..2bd99940e --- /dev/null +++ b/libre/maven-libre/PKGBUILD @@ -0,0 +1,76 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +_pkgname=maven +pkgname=maven-libre +pkgver=3.0.4 + +provides=("$_pkgname=$pkgver") +replaces=("$_pkgname") +conflicts=("$_pkgname") + +pkgrel=1 +pkgdesc="A Java project management and project comprehension tool" +arch=('any') +url="http://maven.apache.org" +license=('Apache') +depends=('java-environment') +makedepends=('apache-ant') +backup=('etc/maven/settings.xml') + +_mirror=http://archive.apache.org/dist +source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz + maven.sh maven.csh) + +_M2_LOCALREPO="/usr/share/maven/repository" + +# FIXME: This also does tasks for package() +build() { + cd $srcdir/apache-maven-$pkgver + + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh + + export MAVEN_OPTS=-Xmx512m + export M2_HOME="$pkgdir"/opt/maven + export PATH="$PATH:$M2_HOME/bin" + + # FIXME: Downloads many deps from Internet. They should be + # packaged separately and added to depends=() + install -d "$pkgdir`dirname $_M2_LOCALREPO`" + cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO" + install -d "$pkgdir"/opt + ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO" + rm "$pkgdir"/opt/maven/*.txt +} + +package() { + install -d "$pkgdir$_M2_LOCALREPO" + + # Install config file in /etc + # Unlike the other directories, we symlink from the system to /opt/maven + # because that way all conf files stay in /etc + install -d "$pkgdir"/etc/maven + sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \ + < "$pkgdir"/opt/maven/conf/settings.xml \ + > "$pkgdir"/etc/maven/settings.xml + rm -rf "$pkgdir"/opt/maven/conf + ln -s /etc/maven "$pkgdir"/opt/maven/conf + + # Install profile.d settings + install -d "$pkgdir"/etc/profile.d + install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d + + # Link executables to /usr/bin + install -d "$pkgdir"/usr/bin + ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin + + # Link jar files to appropriate place in /usr/share + install -d "$pkgdir"/usr/share/java + ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven +} + +md5sums=('17ca94d5be05a78c6ab12425b7a0ee10' + '58820067a4d7384477daa134023d9b57' + 'e2bbdeffed100cd51d05b2ba8ebd6321') diff --git a/libre/maven-libre/maven.csh b/libre/maven-libre/maven.csh new file mode 100644 index 000000000..f5750cfc8 --- /dev/null +++ b/libre/maven-libre/maven.csh @@ -0,0 +1,2 @@ +setenv MAVEN_OPTS -Xmx512m +setenv M2_HOME=/opt/maven diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh new file mode 100644 index 000000000..b6655cc22 --- /dev/null +++ b/libre/maven-libre/maven.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export MAVEN_OPTS=-Xmx512m +export M2_HOME=/opt/maven diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD index 65fc932ef..fd3ebc7c1 100644 --- a/libre/pacman-mirrorlist-libre/PKGBUILD +++ b/libre/pacman-mirrorlist-libre/PKGBUILD @@ -7,31 +7,21 @@ pkgver=$(date +%Y%m%d) pkgrel=1 pkgdesc="Parabola GNU/Linux mirror list for use by pacman" arch=('any') -url="http://repo.parabolagnulinux.org/files/mirrorlist" +url="http://repo.parabolagnulinux.org/mirrorlist.txt" license=('GPL') groups=('base') -#backup=(etc/pacman.d/mirrorlist) -source=(mirrorlist) +backup=(etc/pacman.d/mirrorlist) +source=(mirrorlist::${url}) conflicts=(pacman-mirrorlist) replaces=(pacman-mirrorlist) provides=(pacman-mirrorlist) +md5sums=('e070f8d2639fdb742d0bfb21d27820d1') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' -# NOTE on building this package: -# * Go to the trunk/ directory -# * Run bash -c ". PKGBUILD; updatelist" -# * Update the checksums, update pkgver -# * Build the package - -updatelist() { - wget -O mirrorlist http://repo.parabolagnulinux.org/files/mirrorlist -} - build() { mkdir -p $pkgdir/etc/pacman.d install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/ } -md5sums=('6440731bd17b4b6da3927e4882783946') |