From 7cb984c0e1226ac1e5606206ff7c6a34eecb63fd Mon Sep 17 00:00:00 2001 From: root Date: Sun, 13 Jan 2013 01:15:03 -0800 Subject: Sun Jan 13 01:14:34 PST 2013 --- community/brise/PKGBUILD | 8 +- community/cdrtools/PKGBUILD | 6 +- community/fatrat/PKGBUILD | 4 +- community/fcitx-configtool/PKGBUILD | 9 +- community/fcitx-mozc/PKGBUILD | 12 +- community/gambas2/PKGBUILD | 6 +- community/gambas3/PKGBUILD | 6 +- community/ibus-rime/PKGBUILD | 8 +- community/librime/PKGBUILD | 8 +- community/pdf2djvu/PKGBUILD | 6 +- community/pidgin-kwallet/PKGBUILD | 31 ++ community/tesseract/PKGBUILD | 113 ++-- extra/calligra/PKGBUILD | 11 +- extra/evas_generic_loaders/PKGBUILD | 4 +- extra/inkscape/PKGBUILD | 6 +- extra/libreoffice/PKGBUILD | 6 +- extra/libtorrent-rasterbar/PKGBUILD | 8 +- extra/monodevelop-debugger-gdb/PKGBUILD | 8 +- extra/monodevelop/PKGBUILD | 11 +- extra/poppler/PKGBUILD | 8 +- extra/python-urwid/PKGBUILD | 6 +- extra/qpdf/PKGBUILD | 8 +- extra/telepathy-qt/PKGBUILD | 13 +- extra/windowmaker/PKGBUILD | 6 +- extra/x2goclient/PKGBUILD | 29 + extra/x2goclient/x2goclient.install | 11 + extra/x2goserver/PKGBUILD | 66 +++ extra/x2goserver/x2goserver.install | 61 +++ extra/x2goserver/x2goserver.service | 10 + libre/calibre-libre/PKGBUILD | 4 +- libre/dpkg/PKGBUILD | 10 +- libre/dpkg/dpkg-gpg2.patch | 11 + libre/icecat/PKGBUILD | 227 ++++---- libre/icecat/bug-xulrunner-copy-stub.patch | 11 + libre/icecat/firefox-install-dir.patch | 56 +- libre/icecat/firefox.install | 13 + libre/icecat/icecat.desktop | 58 +- libre/icecat/libre.patch | 587 -------------------- libre/icecat/mozconfig | 73 ++- libre/icecat/mozconfig.pgo | 4 +- libre/icecat/shared-libs.patch | 12 + libre/icecat/vendor.js | 12 + libre/iceweasel-libre/PKGBUILD | 481 ++++++++++++----- libre/iceweasel-libre/bug677092.patch | 330 ++++++++++++ libre/iceweasel-libre/firefox.install | 13 + libre/iceweasel-libre/iceweasel-install-dir.patch | 12 +- libre/iceweasel-libre/iceweasel.desktop | 175 +++--- libre/iceweasel-libre/libre.patch | 596 +++------------------ libre/iceweasel-libre/mozconfig | 54 +- libre/iceweasel-libre/mozconfig.pgo | 4 +- libre/iceweasel-libre/replace-urls.txt | 25 + libre/iceweasel-libre/vendor.js | 17 + libre/linux-libre-lts/PKGBUILD | 8 +- libre/linux-libre-lts/config.i686 | 4 +- libre/linux-libre-lts/config.x86_64 | 4 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 15 +- libre/linux-libre/config.i686 | 4 +- libre/linux-libre/config.x86_64 | 4 +- .../linux-libre/drm-fix-track-free-areas-3.7.patch | 153 ++++++ libre/linux-libre/linux-libre.install | 2 +- libre/texlive-bin-libre/PKGBUILD | 11 +- pcr/mozilla-devscripts/PKGBUILD | 32 ++ 63 files changed, 1827 insertions(+), 1686 deletions(-) create mode 100644 community/pidgin-kwallet/PKGBUILD create mode 100644 extra/x2goclient/PKGBUILD create mode 100644 extra/x2goclient/x2goclient.install create mode 100644 extra/x2goserver/PKGBUILD create mode 100644 extra/x2goserver/x2goserver.install create mode 100644 extra/x2goserver/x2goserver.service create mode 100644 libre/dpkg/dpkg-gpg2.patch create mode 100644 libre/icecat/bug-xulrunner-copy-stub.patch create mode 100644 libre/icecat/firefox.install create mode 100644 libre/icecat/shared-libs.patch create mode 100644 libre/iceweasel-libre/bug677092.patch create mode 100644 libre/iceweasel-libre/firefox.install create mode 100644 libre/iceweasel-libre/replace-urls.txt create mode 100644 libre/linux-libre/drm-fix-track-free-areas-3.7.patch create mode 100644 pcr/mozilla-devscripts/PKGBUILD diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD index 08a24307e..225429d81 100644 --- a/community/brise/PKGBUILD +++ b/community/brise/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 82228 2013-01-12 17:11:20Z fyan $ # Maintainer: Felix Yan # Contributor: GONG Chen pkgname=brise -pkgver=0.13 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc="Rime schema repository" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" @@ -24,4 +24,4 @@ package() { cd "${srcdir}/$pkgname" make DESTDIR="$pkgdir" install } -md5sums=('2346866c7a10e3f7f210a551083b31ac') +md5sums=('bc45f42852fd7bed59a171233d50cb79') diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index 549ccb811..bdda55c8f 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 81381 2012-12-19 11:23:36Z stativ $ +# $Id: PKGBUILD 82236 2013-01-12 18:33:09Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=cdrtools -pkgver=3.01a10 +pkgver=3.01a11 pkgrel=1 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=(!makeflags) backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) -md5sums=('85abd7dc87ed9fdbcecca50ab6da7d7d') +md5sums=('e4f8f105affc5d93b6ebabd63c43c8a6') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index ef0912def..d2de5c07e 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81376 2012-12-19 10:52:03Z stativ $ +# $Id: PKGBUILD 82226 2013-01-12 16:49:34Z eric $ # Maintainer: Lukas Jirkovsky pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=2 +pkgrel=3 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64') url="http://fatrat.dolezel.info/" diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD index fa2fa3280..1737f2e26 100644 --- a/community/fcitx-configtool/PKGBUILD +++ b/community/fcitx-configtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80513 2012-11-23 11:40:13Z fyan $ +# $Id: PKGBUILD 82240 2013-01-13 01:32:17Z fyan $ # Maintainer: Felix Yan pkgname=fcitx-configtool -pkgver=0.4.5.1 -pkgrel=2 +pkgver=0.4.5.2 +pkgrel=1 pkgdesc="GTK based config tool for Fcitx" arch=('i686' 'x86_64') url="http://fcitx.googlecode.com/" @@ -16,7 +16,6 @@ build() { cd "$srcdir/$pkgname-$pkgver" msg "Starting make..." - rm -rf build mkdir build cd build @@ -29,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('6787dedcb57e6147553ef755c51bb46b') +md5sums=('fc5d232ed2e7b7b3fced0264961f48d9') diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 456ff25ea..aa660d9e0 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,20 +1,19 @@ -# $Id$ +# $Id: PKGBUILD 82225 2013-01-12 16:39:34Z fyan $ # Maintainer: Felix Yan # Contributor: ponsfoot ## Mozc compile option _bldtype=Release -_zipcoderel=201211 +_zipcoderel=201211 #201212 is broken, for now _protobuf_ver=2.4.1 _pkgbase=mozc pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.6.1187.102 -_patchver=${pkgver}.2 -pkgrel=4 -groups=('mozc-im') +_patchver=${pkgver}.3 +pkgrel=5 arch=('i686' 'x86_64') url="http://code.google.com/p/mozc/" license=('custom') @@ -93,8 +92,9 @@ package() { install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } + md5sums=('e5246d17a81d2e942e9e8de0c3240c95' 'e61df4b5754f3869ca504d269dc9641d' '59c5f7e9c734b40197454318f228859f' 'ed436802019c9e1f40cc750eaf78f318' - 'a70fa7d5cef505c14f61e739b0502444') + '3c947ef02d9bf3341192ba22916f3605') diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 8ae8cd258..18ba72120 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78524 2012-10-20 09:33:12Z heftig $ +# $Id: PKGBUILD 82215 2013-01-12 08:15:28Z andrea $ # Maintainer : Laurent Carlier # Contributor: Biru Ionut # Contributor: Andrea Scarpino @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=8 +pkgrel=9 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -72,6 +72,8 @@ build() { cd gb.pdf patch -Np0 -i ../../poppler-0.20.patch cd .. + # replace obsolete AM_CONFIG_HEADER + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4 ./reconf-all ## diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index b6dbc39b9..1fefecc1a 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81800 2012-12-30 15:21:02Z foutrelis $ +# $Id: PKGBUILD 82216 2013-01-12 08:15:30Z andrea $ # Maintainer: Laurent Carlier # Contributor : sebikul @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -42,6 +42,8 @@ build() { # Fix build with LLVM 3.2 patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch + # replace obsolete AM_CONFIG_HEADER + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4 ./reconf-all ./configure --prefix=/usr -C diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index 7507f1ec7..58eba088d 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80615 2012-11-27 03:11:48Z fyan $ +# $Id: PKGBUILD 82230 2013-01-12 17:16:35Z fyan $ # Maintainer: Felix Yan # Contributor: GONG Chen # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.4 -pkgrel=2 +pkgver=0.9.6 +pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('ec7fdc6f8c772b1c5412be59546bc667') +md5sums=('02d87a0b45f0a03a80e7e10d963d8f4c') diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD index 5448efe84..407e5f950 100644 --- a/community/librime/PKGBUILD +++ b/community/librime/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80591 2012-11-26 15:20:56Z fyan $ +# $Id: PKGBUILD 82224 2013-01-12 16:38:20Z fyan $ # Maintainer: Felix Yan # Contributor: GONG Chen # Contributor: 網軍總司令 pkgname=librime -pkgver=0.9.4 -pkgrel=3 +pkgver=0.9.6 +pkgrel=1 pkgdesc="Rime input method engine" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('c917d52ddc5483147d0409de9dafc8af') +md5sums=('3e57ad55bcd82e7c995ad37f52b7d432') diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index a4d83244e..a032ac75e 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78527 2012-10-20 09:33:28Z heftig $ +# $Id: PKGBUILD 82217 2013-01-12 08:15:31Z andrea $ # Contributor: Paulo Matias # Maintainer: Jelle van der Waa pkgname=pdf2djvu -pkgver=0.7.15 +pkgver=0.7.16 pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') @@ -30,4 +30,4 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } -md5sums=('cd03b61636b8d58592e7f419b434581f') +md5sums=('6ba1e576212e129111518a8c4afd1092') diff --git a/community/pidgin-kwallet/PKGBUILD b/community/pidgin-kwallet/PKGBUILD new file mode 100644 index 000000000..85692069a --- /dev/null +++ b/community/pidgin-kwallet/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 82219 2013-01-12 09:18:51Z fyan $ +# Maintainer: Felix Yan +# Contributor: Mateusz Slazynski + +pkgname=pidgin-kwallet +pkgver=1.1.0 +pkgrel=2 +pkgdesc="KWallet plugin for Pidgin" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php/Pidgin+KWallet+Plugin?content=127136" +license=('GPL') +depends=('pidgin' 'kdelibs') +makedepends=('cmake') +options=(!libtool) +source=("http://kde-apps.org/CONTENT/content-files/127136-PidginKWallet-$pkgver.tar.bz2") +md5sums=('c8fde518d8058de8302124791d0d15c6') + +build() { + cd "$srcdir/PidginKWallet-$pkgver" + + mkdir -p build + cd build + + cmake .. + make +} + +package() { + #sed -i 's|GemRBPath=.*|GemRBPath=/usr/share/gemrb/|' "$pkgdir/etc/GemRB.cfg.sample + install -Dm644 "$srcdir/PidginKWallet-$pkgver/build/plugin/libkwallet.so" "$pkgdir/usr/lib/pidgin/libkwallet.so" +} diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD index 81ef0cae8..8ac6c01d2 100644 --- a/community/tesseract/PKGBUILD +++ b/community/tesseract/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 79036 2012-10-29 09:23:46Z spupykin $ +# $Id: PKGBUILD 82232 2013-01-12 17:31:36Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Andreas Hauser # chinese requires two files -_langs=(ind swe ron slv srp tgl tur hun fin ita nld jpn vie spa ukr fra slk -kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim) +_langs=(afr ara aze bel ben bul cat ces chi_sim chi_tra chr dan deu ell +eng enm epo epo_alt equ est eus fin fra frk frm glg grc heb hin hrv hun +ind isl ita ita_old jpn kan kor lav lit mal mkd mlt msa nld nor pol por +ron rus slk slv spa spa_old sqi srp swa swe tam tel tgl tha tur ukr vie) pkgbase=tesseract pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done)) pkgver=3.02.02 -pkgrel=1 +_pkgver=3.02 +pkgrel=2 pkgdesc="An OCR programm" arch=(i686 x86_64) url="http://code.google.com/p/tesseract-ocr" @@ -17,42 +20,74 @@ license=("APACHE") depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica) source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz $(for l in ${_langs[@]}; do - echo http://tesseract-ocr.googlecode.com/files/${l}.traineddata.gz + echo http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${_pkgver}.${l}.tar.gz done)) md5sums=('3d57ee5777fa998632ad0693c13a0e9e' - 'f4ae2e5668f693cc51c6e3c3f57a8f1d' - '3787ff0fc1a07517203466830f6f868e' - '7b50075692e7a07ac8f59e0cde51cfb9' - 'defc498fa09480ef0052fde79f4f84e5' - 'c1e0f0ef07d26a72063802370bbfe2c9' - 'af86cab0da52fff7e83f9c7668617a21' - 'b0f4798bf1f9ee541ae73aff49f08821' - '966fa3ebe24d7dfade951e0a4a9f52b5' - '33812ef03197dce20b8c888409d8541a' - '9a307661a010703cd2bb265a3da5eaff' - '89992f69802b9f4a36fec40efd95c503' - 'cad3dd7c9401fa0676bf195456ba0c14' - 'af75c7a696b18a1d2e4f7e21a222cf95' - 'dd9078211127189995504f034468fcd6' - '56a82ac3994f0552d54fd14ff5ed6817' - 'e6000550883684b5e93b7e0a21016287' - '2e7fbf80215b38f423dcf78e396b92d7' - '909b811739b2e7d51cc3ca109998353a' - '0d3a21c18f752eb058e7b854c37b7a69' - 'c477b7faddc044a4595135d0378be34c' - 'd0b59fcfd80f9e09be890647ae93f00d' - 'a7501f9a48bc7ef2fa50cba8b8f0c7b1' - '1f366f55e5e0725deb751ec847bf42dc' - '1b4460ab998151f1ed8e48928ded58be' - 'c3d6447245663138f1d3aa4567c72192' - 'cfa8a81df6a34940604fafa7353ffc43' - 'be81a761f61800f6d39393a31435fff3' - '7aaeb321dbf069d14d2601dc36d3dddc' - '2e97c952075064834f1cad6a133970fa' - '308099b2b95834916ec410191c86cd48' - 'd91041ad156cf2db36664e91ef799451' - '06fce5f5c0221286eab591819406d91e' - '127e0b742b615d81c3b97a555acd8285') + '16a756bf353896e34386f4509582e487' + 'd7b3708f1f1f2898c258209923063f57' + '143044ff7b643b844c2f0b2a170ceda2' + '3bb6dab515166d641ac62e973c868ac5' + '0b662630eb4b2e0ebf40c38184068fba' + '91fc34ef041aafe32549a7a6232afad0' + '27b77ecc66f8c8d904cd6b87886aca22' + 'ae144b9d230267b5ae62804ad7a09dac' + '718779539d3202ae95ae5ff52a3ad5e8' + '391ed3fcf014bae777b33dc7a771a00d' + 'dd5b4fa247500d7713ab5556af62d9fa' + '2f6a93920b3ce55de24ca762a66a5de1' + '57bdb26ec7c767e126ff97776d8bfb10' + '3760cc3dee6489dcc865b31e7a36bd47' + '3562250fe6f4e76229a329166b8ae853' + 'd9dc4ad9cbcde78e5be59eb226865661' + '5dc0cf01d21ee43ed834ee947e1e810a' + '67815529386679223092ddf301bf57d4' + '94667836c651fc4fd43645efdc34e19a' + 'a067f5975cbe83fea205897187fa256b' + '4c2cee5bf3558f6384e5907aa02ae80c' + '71f8b343ed2010f775ff474faec5874f' + '2bca200b783fdba2f546063c68740c50' + 'dd734ac212a98a02945760891b657e70' + 'e0ca24ca45de83e67057f0e208233ffc' + 'ef7b8e13891e08f29b02011a5dd6b630' + 'f14aac95ab2f4a5f919da82dbc1fcd3c' + '7ae7f3384083c66f06d63b6c0f0a66c3' + '186f17b326a58313344c2ea987ea7785' + '0396a267d894f485b6b534476f3322dc' + 'eb1b3537cd664fec48bebac75fac5992' + '9f672ea7c90eecbbe35ec353ff45c764' + '3f05946a9e57a8ffabb3fccc8a80cfaa' + 'fbdba86f34b907f5a709051c01b53f71' + '989ca558eb05fcf6873dfdd8c692291d' + 'e1be2b08e667c3bb0ab0f18c9456bf2f' + '510016e85d7ea8e1f4ebf98741138909' + 'fc9125f6652fb661575d6e15c94f88f6' + '2095b56c9c6b0dba9b837fd226ed6d29' + '801021a1ad6e4aa3ef697f065ff6c798' + '1f5e8f022d3c2697075bdfc03935f128' + 'b8930c64befcaadbb47951cad4a2f075' + '90a41ac86375b230980b643b35b88011' + 'cb42ec9504eecdc4f974dbca4387ac34' + '6db5753b3b03296544bbb2c0f59a7178' + '6d979585abb07c13dda003820129461c' + '90b3f1f4113a9dccd0287e6b5b7512d6' + 'ad490a8091ee329190266f3fd057c511' + '9f498e01855a57473af8f083c125455a' + 'e8c785df8aaa49e61f3a95aa24066122' + '991e4771e16abd6a66caeaeeb2a4d4d2' + 'c7bea975ba663d13e03c29d6cf33b5a8' + 'fe1385ed203ecd9e0999a44b135069ec' + '7838da948e404bb760bef83a5c3d64dd' + '372e38617fcc7e25c77996c5499ae063' + 'd8350668fa790b5d4007348a55840bdf' + '6c68107a71f82fa42c858e4d6dc70aca' + '46d3a5d7159236edb33272dd8b1090f6' + 'c68b0fdcdf34dd431c25f323673ef1d6' + '349d203ef88864eab8d1201672ca84be' + 'd458f0719b99e4dcfd4fa2a06e5150a3' + '3dc5a5028e75da12eaba62669a80acc4' + 'a8934e0e6496997112cbef2961adef5e' + '0aa61f18463bb89234a6d06fcbf0c644' + '78a74432848b4c53cc2ccf2eb339c0b6') build() { cd $srcdir/$pkgname-$pkgver @@ -80,7 +115,7 @@ package_tesseract-data-${l}(){ groups=('tesseract-data') mkdir -p \$pkgdir/usr/share/tessdata - cp \$srcdir/${l}.traineddata \$pkgdir/usr/share/tessdata/ + cp \$srcdir/tesseract-ocr/tessdata/${l}.* \$pkgdir/usr/share/tessdata/ find \$pkgdir/usr/share/tessdata -type f -exec chmod 0644 {} \; } " diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 352da12ac..0c9b69a58 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171683 2012-11-21 11:19:58Z andrea $ +# $Id: PKGBUILD 175030 2013-01-12 08:15:19Z andyrtr $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -18,13 +18,13 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' - 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' + 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt>=0.22.0' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") @@ -135,8 +135,7 @@ package_calligra-plan() { package_calligra-stage() { pkgdesc="Write presentation documents" - depends=('calligra-libs' 'kdebase-runtime') - optdepends=('calligra-plugins: extra calligra plugins') + depends=('calligra-plugins' 'kdebase-runtime') conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') install=calligra-stage.install @@ -177,7 +176,7 @@ package_calligra-sheets() { package_calligra-words() { pkgdesc="Word Processor" - depends=('calligra-libs' 'kdegraphics-okular') + depends=('calligra-plugins' 'kdegraphics-okular') optdepends=('calligra-tools: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index c1b958e12..0c227f4dd 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174826 2013-01-07 19:40:46Z ronald $ +# $Id: PKGBUILD 175032 2013-01-12 08:15:25Z andyrtr $ # Maintainer: Ronald van Haren # Contributor: Gustavo Sverzut Barbieri pkgname=evas_generic_loaders pkgver=1.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 9d30c8d72..2f38a9b85 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 173270 2012-12-18 01:27:21Z bisson $ +# $Id: PKGBUILD 175033 2013-01-12 08:15:28Z andyrtr $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: tobias pkgname=inkscape pkgver=0.48.4 -pkgrel=1 +pkgrel=2 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 3df07831f..c7d4da8b8 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173765 2012-12-22 16:44:33Z andyrtr $ +# $Id: PKGBUILD 175034 2013-01-12 08:15:36Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -26,13 +26,13 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.4.3 pkgver=3.6.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'poppler>=0.22.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index c0923b187..5b31c0514 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170197 2012-11-04 18:02:05Z ibiru $ +# $Id: PKGBUILD 175075 2013-01-12 16:47:42Z eric $ # Maintainer : Ionut Biru # Contributor: Hugo Doria pkgname=libtorrent-rasterbar -pkgver=0.16.5 +pkgver=0.16.6 pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64') -license=('custom') +license=('BSD') depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('dde29c7a51392d9098de23e2e69a993a5c380016') +sha1sums=('baf95f53be99a90c4bb1488a72e9d625684bbbd2') build() { cd $pkgname-$pkgver diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 6170cb7b6..1dc7e8fae 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 165115 2012-08-11 08:21:45Z andyrtr $ +# $Id: PKGBUILD 175074 2013-01-12 15:33:07Z daniel $ # Maintainer: Daniel Isenmann pkgname=monodevelop-debugger-gdb -pkgver=3.0.3.5 +pkgver=3.0.6 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') # also "any" pkg? url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=3.0.3.5-2' 'gdb') +depends=('monodevelop>=3.0.6' 'gdb') makedepends=('mono') options=('!makeflags') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('c16da5cdbda46fb32e0dc730bb433203') +md5sums=('9f3d08104d01e536342ffe15bdd5727c') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 2ba30d678..85c19338a 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165114 2012-08-11 08:21:42Z andyrtr $ +# $Id: PKGBUILD 175072 2013-01-12 15:31:21Z daniel $ # Maintainer: Daniel Isenmann # Contributor: Timm Preetz # Contributor: Giovanni Scafora pkgname=monodevelop -pkgver=3.0.3.5 -pkgrel=2 +pkgver=3.0.6 +pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" # should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH @@ -14,11 +14,12 @@ arch=('i686' 'x86_64') url="http://www.monodevelop.com" license=('GPL') depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('rsync') options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 monodevelop-core-addins.pc.in.patch) -md5sums=('ca46b77b49266112b63a8f5c451c5565' +md5sums=('748d0fb89c40c2cb5a9267c8635eb55d' '8466d032735130e37d4091a793a7966c') build() { @@ -27,7 +28,7 @@ build() { cd $srcdir/$pkgname-$pkgver # fix location for MonoDevelop.Gettext.dll - breaks gdb build - patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch + # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb LD_PRELOAD="" make diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index ecb84a61c..a0a4c1dd8 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169388 2012-10-20 09:31:48Z andyrtr $ +# $Id: PKGBUILD 175029 2013-01-12 08:15:09Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.5 +pkgver=0.22.0 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('8a80ae83eb7a327b031808d09ee1d54d' +md5sums=('c7038be37a7d446544e83a7df3c26196' '9dc64c254a31e570507bdd4ad4ba629a') build() { @@ -36,7 +36,7 @@ check() { cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check || /bin/true + LANG=en_US.UTF8 make check } package_poppler() { diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index d1804969c..ed81cf84e 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -4,15 +4,15 @@ # Maintainer: Douglas Soares de Andrade pkgname=('python-urwid' 'python2-urwid') -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Urwid is a curses-based user interface library." license=('LGPL') arch=('i686' 'x86_64') makedepends=('python2-distribute' 'python-distribute') url="http://excess.org/urwid/" source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('00542bbd15fae7ea60b02a7570edee2b') +md5sums=('eca2e0413cf7216b01c84b99e0f2576d') build() { cp -r urwid-$pkgver python2-urwid-$pkgver diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index 6ba997c51..124697112 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166374 2012-09-07 06:46:11Z andyrtr $ +# $Id: PKGBUILD 175036 2013-01-12 08:15:44Z andyrtr $ # Maintainer: AndyRTR # Contributor: Miguel Revilla # Contributor: David Sotelo # Contributor: Nuno Araujo pkgname=qpdf -pkgver=3.0.2 +pkgver=4.0.0 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64') @@ -15,12 +15,10 @@ depends=('pcre' 'perl') makedepends=('make') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('af6f6f964481295a6ca0766185bfa274') +md5sums=('812ffc8c5b8fb5cf9310fcbd9a7d20d3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix rpath errors (from Fedora spec) - autoreconf -vfi ./configure --prefix=/usr --disable-static make } diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 9a3e23e20..31106382e 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 171095 2012-11-16 16:58:51Z andrea $ +# $Id: PKGBUILD 175068 2013-01-12 13:26:14Z andrea $ # Maintainer: Ionut Biru # Maintainer: Andrea Scarpino pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt' 'telepathy-glib') -#depends=('qt' 'telepathy-farstream') +depends=('qt' 'telepathy-farstream' 'farstream-0.1') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') provides=('telepathy-qt4') -source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('94ac93aedf5f6fff49837bc8368e5a37') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}) +md5sums=('94ac93aedf5f6fff49837bc8368e5a37' + 'e1b851b08b159fca39596ff8395ca53a') build() { cd "$srcdir" @@ -26,6 +26,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DENABLE_TESTS=OFF make } diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 3b20bf518..12d68b900 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159727 2012-05-26 10:06:04Z daniel $ +# $Id: PKGBUILD 175070 2013-01-12 14:16:01Z daniel $ # Maintainer: Daniel Isenmann # Contributor: Judd Vinet pkgname=windowmaker -pkgver=0.95.3 +pkgver=0.95.4 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('305af9d862e853a5d7977e801cb66ca3' +md5sums=('640b8ea5b1a875440aa48eaab09c5f00' '2fba97bebfd691836b92b8f0db79ff13') build() { diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD new file mode 100644 index 000000000..41394e64e --- /dev/null +++ b/extra/x2goclient/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 175060 2013-01-12 11:27:38Z andyrtr $ +# Maintainer: AndyRTR +# Contributor: Gerhard Brauer +# Contributor: Richard Murri + +pkgname=x2goclient +pkgver=4.0.0.1 +pkgrel=1 +pkgdesc="x2go qt4 client" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.x2go.org" +depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('man2html') +install=x2goclient.install +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('e8786329cfe97652d337f71caa71f432') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s:qmake-qt4:qmake:g" Makefile + sed -i "s:-o root -g root ::" Makefile + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="$pkgdir" install +} diff --git a/extra/x2goclient/x2goclient.install b/extra/x2goclient/x2goclient.install new file mode 100644 index 000000000..51c21a337 --- /dev/null +++ b/extra/x2goclient/x2goclient.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor +} diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD new file mode 100644 index 000000000..fa620c2cf --- /dev/null +++ b/extra/x2goserver/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 175061 2013-01-12 11:27:40Z andyrtr $ +# Maintainer: AndyRTR + +# Contributor: Gerhard Brauer +# Contributor: Richard Murri +# Contributor: Markus Opitz +# Contributor: Milan Knížek + +pkgname=x2goserver +pkgver=4.0.0.0 +pkgrel=2 +pkgdesc="Open source terminal server" +arch=('i686' 'x86_64') +url="http://www.x2go.org/" +license=('GPL') +depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth') +makedepends=('man2html') +#optdepends=('cups-x2go: printing support') +options=('emptydirs') +install=x2goserver.install +backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) +md5sums=('1fc38566832c30897c6583e7ffa1fda3' + 'b09799f9203150dc1277a56058be48a8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # -r option does not exist in Arch linux + # (However, html man pages do not get installed anyway...) + for Makefile in $(find . -type f -name Makefile); do + sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile + sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile + done + + # fix some Makefile permission options + for Makefile in $(find . -type f -name Makefile); do + sed -i "s:-o root -g root ::g" $Makefile + done + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="$pkgdir" install + + # systemd service file - only runs x2gocleansessions + install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" + + # X2go homedir + printing spool dir + install -dm 755 $pkgdir/var/lib/x2go + install -dm 755 $pkgdir/var/spool/x2go + + # load fuse module at system start + install -dm755 $pkgdir/usr/lib/modprobe.d + echo "fuse" > $pkgdir/usr/lib/modprobe.d/x2goserver.conf + + install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" + install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" + install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" + + # cleanup unneded files/directories + rmdir $pkgdir/etc/X11/Xsession.d + rm -f $pkgdir/etc/x2go/Xresources +} diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install new file mode 100644 index 000000000..0688960cc --- /dev/null +++ b/extra/x2goserver/x2goserver.install @@ -0,0 +1,61 @@ +pre_install() { + cat << 'EOM' + ==> Use the following command to setup sqlite database: + ==> x2godbadmin --createdb +EOM +} + + +post_install() { + + # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values + + # x2gouser + if grep -q "^x2gouser:" /etc/group &> /dev/null ; then + groupmod -g 111 -n x2gouser x2gouser &> /dev/null + else + groupadd -g 111 x2gouser &> /dev/null + fi + + if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then + usermod -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null + else + useradd -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null + fi + + # x2goprint + if grep -q "^x2goprint:" /etc/group &> /dev/null ; then + groupmod -g 112 -n x2goprint x2goprint &> /dev/null + else + groupadd -g 112 x2goprint &> /dev/null + fi + + if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then + usermod -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null + else + useradd -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null + fi + + # fix permissions - see INSTALL file + chown -R x2goprint:x2goprint /var/spool/x2go + chmod 0770 /var/spool/x2go + + chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper + chmod 2755 /usr/lib/x2go/x2gosqlitewrapper + + chown root:x2goprint /usr/bin/x2goprint + chmod 2755 /usr/bin/x2goprint +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + userdel x2gouser &> /dev/null + userdel x2goprint &> /dev/null + groupdel x2gouser &> /dev/null || /bin/true + groupdel x2goprint &> /dev/null || /bin/true + rm -rf /var/lib/x2go/* &> /dev/null || /bin/true + rm -rf /var/spool/x2go/* &> /dev/null || /bin/true +} diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service new file mode 100644 index 000000000..393d841c5 --- /dev/null +++ b/extra/x2goserver/x2goserver.service @@ -0,0 +1,10 @@ +[Unit] +Description=x2go - remote desktop server +After=syslog.target network.target + +[Service] +ExecStart=/usr/sbin/x2gocleansessions +PIDFile=/run/x2goserver.pid + +[Install] +WantedBy=multi-user.target diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 52c390c3a..ac3046760 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.13 +pkgver=0.9.14 pkgrel=1 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('3ad062f85eca072c3990c766bc05412a' +md5sums=('0a809b1c1378f95a69337b9bc8207493' '42c07b43d575b5e7e7524bd7b9528f0e' '675cd87d41342119827ef706055491e7') diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index aa82d36e6..5d7534534 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -16,14 +16,14 @@ pkgver=1.16.9 url="http://packages.debian.org/source/sid/dpkg" _debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid -pkgrel=1.1 +pkgrel=1.2 debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'xz' 'zlib' 'ncurses') checkdepends=('perl-test-pod') makedepends=('perl-io-string' 'perl-timedate') source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" - dpkg-gzip-rsyncable.patch) + dpkg-gzip-rsyncable.patch dpkg-gpg2.patch) ###################################################################### @@ -79,7 +79,8 @@ _debhelper_install() { build() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" + patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" + patch -Np1 -i "${srcdir}/dpkg-gpg2.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make @@ -122,4 +123,5 @@ package_perl-dpkg() { } md5sums=('4df9319b2d17e19cdb6fe94dacee44da' - '5ab63758999e9bb10f84bce79a0307b2') + '5ab63758999e9bb10f84bce79a0307b2' + '74b7ce3045690a8fc290104f10cf8d42') diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch new file mode 100644 index 000000000..28671c484 --- /dev/null +++ b/libre/dpkg/dpkg-gpg2.patch @@ -0,0 +1,11 @@ +--- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig 2013-01-09 01:28:47.000000000 -0500 ++++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm 2013-01-09 01:30:51.000000000 -0500 +@@ -344,7 +344,7 @@ + my $dsc = $self->get_filename(); + my @exec; + if (find_command('gpgv')) { +- push @exec, "gpgv"; ++ push @exec, "gpgv", "--verify"; + } elsif (find_command('gpg')) { + push @exec, "gpg", "--no-default-keyring", "-q", "--verify"; + } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cc5889c7a..c51add2a9 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,115 +1,121 @@ -# Contributor (ConnochaetOS): Henry Jensen +# Maintainer: Márcio Silva # Contributor (Parabola): Luke Shumaker -# Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva + +# Maintainer (ConnochaetOS): Henry Jensen + +# Maintainer (Arch) : Ionut Biru # Contributor (Arch): Jakub Schmidtke + +# Contributor: Figue # Thank you very much to the older contributors: # Contributor: evr -# Contributor: Muhammad 'MJ' Jassim +# Contributor: Muhammad 'MJ' Jassim -# If you are updating this package, don't forget to update the version number in -# the value for 'browser.dictionaries.download.url' in 'libre.patch' +# Version Configuration ############################################## _pgo=false + pkgname=icecat pkgver=17.0.1 pkgrel=1 -pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' -arch=(i686 x86_64 mips64el) -license=(GPL2 MPL LGPL) + +###################################################################### + +if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi +if $_pgo; then pkgname+='-pgo'; fi +if [ "$pkgbase" != "$pkgname" ]; then + provides+=("$pkgbase=$pkgver") + conflicts+=("$pkgbase") +fi + +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox." +arch=( + 'i686' + 'mips64el' + 'x86_64' +) +license=( + 'GPL2' + 'LGPL' + 'MPL' +) depends=( - alsa-lib - dbus-glib - desktop-file-utils - gtk2 - hicolor-icon-theme - hunspell - libevent - libnotify - libvpx - libxt - mime-types - mozilla-common - mozilla-searchplugins + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' 'nss>=3.13.3' - sqlite3 - startup-notification + 'sqlite' + 'startup-notification' ) makedepends=( - autoconf2.13 - diffutils - imagemagick - libidl2 - librsvg - libxslt - mesa - pkg-config - python2 - unzip - wireless_tools - zip -) -optdepends=( - 'wireless_tools: Location detection via available WiFi networks' + 'autoconf2.13' + 'diffutils' + 'imagemagick' + 'imake' + 'libidl2' + 'librsvg' + 'libxslt' + 'mesa' + 'python2' + 'unzip' + 'wireless_tools' + 'zip' ) +[[ $CARCH != mips64el ]] && makedepends+=('yasm') if $_pgo; then - makedepends+=(xorg-server-xvfb) - options=(!ccache) + makedepends+=('xorg-server-xvfb') + options+=(!ccache) fi -options=(!emptydirs) +optdepends=('wireless_tools: Location detection via available WiFi networks') url=http://www.gnu.org/software/gnuzilla/ -install=$pkgname.install -source=( - ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz - mozconfig - mozconfig.pgo - xulrunner-copy-stub.patch - libre.patch - $pkgname.desktop - $pkgname-safe.desktop - $pkgname-install-dir.patch - vendor.js - #cairo.patch -) -md5sums=( - c88a29aa92fc41a07e777a0e63ac5f7e - a22327391a1995703436ed42fe703d3f - ac29b01c189f20abae2f3eef1618ffc0 - 3009b176cc5f9b1e416b1bf7c45b064b - f4cffe48e84283026da634424f4bbee6 - e81ad01dbc16ba28bf92ba4b7c309ca7 - d93fe402b87cd000a869e1fd6badc6c9 - 64826fcf48816b13090042eefddbaa58 - 0d053487907de4376d67d8f499c5502b - #c8552d030494443218d88792f4dbbd0f -) +install=firefox.install +options=(!emptydirs) +source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz + mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706 + bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo + mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch) +md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e' + '78bbfc17be8ef2104699875300a22316' + '3009b176cc5f9b1e416b1bf7c45b064b' + 'a497587cf150ba27ab25cb52f5311044' + 'e4cd438a0b2a42dfb14bc7716e901e5f' + 'd71509923cfede3e634756fee899e492' + 'daa249d183fcf09942ff30db1b279f1e' + '150ac0fb3ac7b2114c8e8851a9e0516c' + '11df9602256561bcf59f15e7f6aaf0ee' + '52e52f840a49eb1d14be1c0065b03a93') build() { - mv $pkgname-$pkgver $srcdir/gnuzilla-build - cd $srcdir/gnuzilla-build - - cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch - if $_pgo; then - cat $srcdir/mozconfig.pgo >> .mozconfig - fi - patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname - patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix - patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff - #patch -Np1 -i $srcdir/cairo.patch # fix cairo + mv $pkgname-$pkgver mozilla-release + cd mozilla-release - # Fix for use nspr, sqlite and nss external - sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \ - browser/installer/Makefile.in + cp ../mozconfig .mozconfig + if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi + patch -Np1 -i ../firefox-install-dir.patch + patch -Np1 -i ../shared-libs.patch + patch -Np1 -i ../libre.patch + patch -Np1 -i ../bug-xulrunner-copy-stub.patch + patch -Np1 -i ../mozilla-bug-756390.patch # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in # This is a bug, we should fix it. - if [ $CARCH = mips64el ]; then + if [[ $CARCH == mips64el ]]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -122,44 +128,53 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi - chmod +x build/unix/run-icecat.sh # fix bug for bad file permition - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" - export PYTHON=/usr/bin/python2 + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + if $_pgo; then + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + fi + + _fail=0 + make -f client.mk build || _fail=1 if $_pgo; then - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS kill $! || true - else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi + return $_fail } package() { - cd $srcdir/gnuzilla-build - make -j1 -f client.mk DESTDIR=$pkgdir install + cd mozilla-release + make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" brandingdir=browser/branding/unofficial - icondir=$pkgdir/usr/share/icons/hicolor - for i in 16x16 32x32 48x48; do - install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png + for i in 16 32 48; do + install -Dm644 $brandingdir/default$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png" done - for d in $pkgname $pkgname-safe; do - install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop - done + install -Dm644 ../$pkgbase.desktop \ + "$pkgdir/usr/share/applications/$pkgbase.desktop" - rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries - ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation - ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins - ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins + # Use system-provided dictionaries + rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation} + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation" + # use mozilla-searchplugins + rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins + ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins" # We don't want the development stuff - rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl} + rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl} - # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin + #workaround for now + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin" } diff --git a/libre/icecat/bug-xulrunner-copy-stub.patch b/libre/icecat/bug-xulrunner-copy-stub.patch new file mode 100644 index 000000000..8ccf127df --- /dev/null +++ b/libre/icecat/bug-xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- a/browser/app/Makefile.in ++++ b/browser/app/Makefile.in +@@ -233,7 +233,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch index b6f9700b3..9c115f0eb 100644 --- a/libre/icecat/firefox-install-dir.patch +++ b/libre/icecat/firefox-install-dir.patch @@ -1,28 +1,30 @@ -diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in ---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 -+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 -@@ -68,8 +68,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --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 - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in ---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 -+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 -@@ -61,8 +61,8 @@ - datadir = @datadir@ - mandir = @mandir@ - --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@ +diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk +--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_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 + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk +--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 +@@ -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 + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) diff --git a/libre/icecat/firefox.install b/libre/icecat/firefox.install new file mode 100644 index 000000000..c1fe8284a --- /dev/null +++ b/libre/icecat/firefox.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop index 8a7cad93d..668d5104f 100644 --- a/libre/icecat/icecat.desktop +++ b/libre/icecat/icecat.desktop @@ -1,11 +1,5 @@ [Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/icecat %u -Icon=icecat -Type=Application -Terminal=false -MultipleArgs=false -Name=GNU IceCat +Name=IceCat GenericName=Web Browser GenericName[af]=Web Blaaier GenericName[ar]=متصفح ويب @@ -73,6 +67,50 @@ GenericName[xh]=Umkhangeli zincwadi we Web GenericName[zh_CN]=网页浏览器 GenericName[zh_TW]=網頁瀏覽器 GenericName[zu]=Umcingi we-Web -MimeType=text/html -StartupNotify=false -Categories=Application;Network; +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=/usr/lib/icecat/icecat %u +Icon=icecat +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index bf2dff437..8fa1c2a20 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,216 +1,6 @@ -diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties ---- a/browser/branding/unofficial/locales/browserconfig.properties -+++ b/browser/branding/unofficial/locales/browserconfig.properties -@@ -3,5 +3,29 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Do NOT localize or otherwise change these values -+ -+# Default startup homepage - browser.startup.homepage=about:home --browser.search.defaultenginename="DuckDuckGo" -+ -+# Default search engine -+browser.search.defaultenginename=DuckDuckGo HTML -+ -+# Search engine order (order displayed in the search bar dropdown)s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search -+ -+# increment this number when anything gets changed in the list below. This will -+# cause Firefox to re-read these prefs and inject any new handlers into the -+# profile database. Note that "new" is defined as "has a different URL"; this -+# means that it's not possible to update the name of existing handler, so -+# don't make any spelling errors here. -+gecko.handlerService.defaultHandlersVersion=3 -+ -+# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js 2012-12-01 16:06:30.000000000 -0200 +++ b/browser/app/profile/firefox.js 2012-12-04 20:42:20.753633713 -0200 -@@ -324,15 +324,15 @@ - 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"); -+pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties"); - - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. --pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties"); - - // search bar results always open in a new tab - pref("browser.search.openintab", false); -@@ -616,23 +616,23 @@ - pref("browser.send_pings", false); - - /* initial web feed readers list */ --pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); - - pref("browser.feeds.handler", "ask"); -@@ -643,7 +643,7 @@ - // region.properties file is newer than the version number in the handler - // service datastore, it will add any new handlers it finds in the prefs (as - // seeded by this file) to its datastore. --pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties"); - - // The default set of web-based protocol handlers shown in the application - // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers -@@ -651,65 +651,65 @@ - // protocol not currently listed here), we should go ahead and add those. - - // webcal --pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // mailto --pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // irc --pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // ircs --pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 - pref("gecko.handlerService.allowRegisterFromDifferentHost", false); - - #ifdef MOZ_SAFE_BROWSING --pref("browser.safebrowsing.enabled", true); --pref("browser.safebrowsing.malware.enabled", true); -+pref("browser.safebrowsing.enabled", false); -+pref("browser.safebrowsing.malware.enabled", false); - pref("browser.safebrowsing.debug", false); - --pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?"); --pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%"); -+pref("browser.safebrowsing.updateURL", ""); -+pref("browser.safebrowsing.keyURL", ""); -+pref("browser.safebrowsing.gethashURL", ""); -+pref("browser.safebrowsing.reportURL", ""); -+pref("browser.safebrowsing.reportGenericURL", ""); -+pref("browser.safebrowsing.reportErrorURL", ""); -+pref("browser.safebrowsing.reportPhishURL", ""); -+pref("browser.safebrowsing.reportMalwareURL", ""); -+pref("browser.safebrowsing.reportMalwareErrorURL", ""); - --pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/"); --pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -+pref("browser.safebrowsing.warning.infoURL", ""); -+pref("browser.safebrowsing.malware.reportURL", ""); - - // Name of the about: page contributed by safebrowsing to handle display of error - // pages on phishing/malware hits. (bug 399233) @@ -1149,13 +1149,3 @@ // might keep around more than this, but we'll try to get down to this value). // (This is intentionally on the high side; see bug 746055.) @@ -225,380 +15,3 @@ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -pref("social.sidebar.unload_timeout_ms", 10000); -pref("social.active", false); -pref("social.toast-notifications.enabled", true); -diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js ---- a/browser/branding/unofficial/content/aboutHome.js -+++ b/browser/branding/unofficial/content/aboutHome.js -@@ -5,100 +5,41 @@ - // If a definition requires additional params, check that the final search url - // is handled correctly by the engine. - const SEARCH_ENGINES = { -- "Duck Duck Go": { -- image: "data:image/png;base64,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"}, -- "Google": { -+ "DuckDuckGo HTML": { - image: "data:image/png;base64," + -- "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" -- , params: "source=hp&channel=np" -- } -- --, "Яндекс": -- { -- image: "data:image/png;base64," + -- "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" - } - }; - -@@ -115,8 +56,8 @@ - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. - - // Bug with dom.storage.enabled set as false --// We are using DDG as a default in this case. --let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"}; -+// We are using DDG HTML as a default in this case. -+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"}; - - document.addEventListener("DOMContentLoaded", function init() { - setupSearchEngine(); -diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,30 +3,18 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=DuckDuckGo -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=DuckDuckGo --browser.search.order.2=Google --browser.search.order.3=Yahoo -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=Bloglines --browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s --browser.contentHandlers.types.1.title=My Yahoo --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s --browser.contentHandlers.types.2.title=Google --browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s -- --# Keyword URL (for location bar searches) --keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - - # URL for site-specific search engines - # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site - # to be searched and the user's search query. Place them in the appropriate location - # for your locale's URL but do not translate them. --browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} - - # increment this number when anything gets changed in the list below. This will - # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -34,3 +22,11 @@ - # means that it's not possible to update the name of existing handler, so - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=3 -+ -+# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in -@@ -11,13 +11,20 @@ -

@bookmarks_toolbarfolder@

-
@bookmarks_toolbarfolder_description@ -

--

@getting_started@ -+
Parabola GNU/Linux-libre -

--

@firefox_heading@

-+

Parabola GNU/Linux-libre

-

--

@firefox_help@ --
@firefox_customize@ --
@firefox_community@ --
@firefox_about@ -+
Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Packages -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Labs -+

-+

Free Software Foundation

-+

-+

Free Software Foundation -+
LibrePlanet -+
Free addons -+
h-node -

-

-diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html ---- a/build/pgo/blueprint/elements.html -+++ b/build/pgo/blueprint/elements.html -@@ -143,7 +143,7 @@ -

-

- <a> anchor
-- <a> a + href -+ <a> a + href -

-

- <abbr> abbr - extended text when mouseover.
-diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul ---- a/dom/ipc/test.xul -+++ b/dom/ipc/test.xul -@@ -294,6 +294,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - - -- -+ -

-

- <a> anchor
-- <a> a + href -+ <a> a + href -

-

- <abbr> abbr - extended text when mouseover.
-diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul ---- iceweasel-13.0.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300 -+++ iceweasel-13.0/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300 -@@ -294,6 +294,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - - -- -+ -

@bookmarks_toolbarfolder@

-
@bookmarks_toolbarfolder_description@ -

--

@getting_started@ -+
Parabola GNU/Linux-libre -

--

@firefox_heading@

-+

Parabola GNU/Linux-libre

-

--

@firefox_help@ --
@firefox_customize@ --
@firefox_community@ --
@firefox_about@ -+
Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Packages -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Labs -+

-+

Free Software Foundation

-+

-+

Free Software Foundation -+
LibrePlanet -+
Free addons -+
h-node -

-

-diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js ---- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 21:44:27.000000000 -0200 -+++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js 2013-01-10 00:53:04.008909619 -0200 + #searchText { +diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 18:44:27.000000000 -0500 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 @@ -5,70 +5,41 @@ // If a definition requires additional params, check that the final search url // is handled correctly by the engine. @@ -560,79 +136,71 @@ diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js icewea } }; -@@ -78,8 +49,8 @@ +@@ -78,7 +49,7 @@ // * add an entry here in the proper ordering (based on spans) // The part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" --, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" + "http://packages.debian.org/experimental/iceweasel" -+, "https://www.gnu.org/software/gnuzilla/addons.html" + , "https://www.gnu.org/software/gnuzilla/addons.html" ]; - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. -@@ -141,10 +112,6 @@ - if (searchEngineInfo.image) { - let logoElt = document.getElementById("searchEngineLogo"); - logoElt.src = searchEngineInfo.image; --#ifdef XP_MACOSX -- if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)")) -- logoElt.src = searchEngineInfo.imageHD; --#endif - logoElt.alt = searchEngineName; - } +diff -ruN 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-01-04 18:44:28.000000000 -0500 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-10 18:18:10.000000000 -0500 +@@ -21,7 +21,7 @@ + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} -diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties ---- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200 -+++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 16:47:47.039271071 -0200 -@@ -1,3 +1,27 @@ - # Do NOT localize or otherwise change these values -+ -+# Default startup homepage - browser.startup.homepage=about:home + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +@@ -30,20 +30,10 @@ + # don't make any spelling errors here. + gecko.handlerService.defaultHandlersVersion=3 -+# Default search engine -+browser.search.defaultenginename=DuckDuckGo HTML -+ -+# Search engine order (order displayed in the search bar dropdown)s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search -+ -+# increment this number when anything gets changed in the list below. This will -+# cause Firefox to re-read these prefs and inject any new handlers into the -+# profile database. Note that "new" is defined as "has a different URL"; this -+# means that it's not possible to update the name of existing handler, so -+# don't make any spelling errors here. -+gecko.handlerService.defaultHandlersVersion=3 -+ -+# The default set of protocol handlers for irc: +-# The default set of protocol handlers for webcal: +-gecko.handlerService.schemes.webcal.0.name=30 Boxes +-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +- +-# 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.1.name=Gmail +-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +- + # The default set of protocol handlers for irc: +-gecko.handlerService.schemes.irc.0.name=Mibbit +-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + + # The default set of protocol handlers for ircs: +-gecko.handlerService.schemes.ircs.0.name=Mibbit +-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -urN iceweasel-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js ---- iceweasel-18.0.orig/debian/branding/firefox-branding.js 2013-01-08 17:55:47.000000000 -0200 -+++ iceweasel-18.0/debian/branding/firefox-branding.js 2013-01-10 01:49:05.807790675 -0200 -@@ -1,3 +1,6 @@ - pref("startup.homepage_override_url",""); - pref("startup.homepage_welcome_url",""); - pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/"); -+ -+// Disable localstorage for privacy reasons. -+pref("dom.storage.enabled", false); -diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css ---- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 -+++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 -@@ -66,8 +66,7 @@ - #searchEngineLogo { - display: inline-block; - height: 28px; -- width: 70px; -- min-width: 70px; -+ width: 47px; - } ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul +--- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 ++++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 +@@ -299,6 +299,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + - #searchText { +- ++ +