diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-12 00:04:48 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-12 00:04:48 -0700 |
| commit | d976aa5e1544c80dc2457ea20b27f28f3fa05899 (patch) | |
| tree | b920a24b920930916f1d58602326568fd1e4e9bf | |
| parent | 337402b957bab442da9e0d46ee7a8d8f32ede3ce (diff) | |
Fri Apr 12 00:04:48 PDT 2013
37 files changed, 904 insertions, 793 deletions
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 4ce9bf0a0..c49379b51 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86523 2013-03-18 14:47:32Z lcarlier $ +# $Id: PKGBUILD 88085 2013-04-11 09:03:50Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=2.0 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>18.0' 'xulrunner<20.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>18.0' 'xulrunner<21.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD new file mode 100644 index 000000000..e5ccd4fea --- /dev/null +++ b/community/jemalloc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 88096 2013-04-11 13:54:05Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Kovivchak Evgen <oneonfire@gmail.com> + +pkgname=jemalloc +pkgver=3.3.1 +pkgrel=1 +pkgdesc="General-purpose scalable concurrent malloc implementation" +arch=('i686' 'x86_64') +license=('BSD') +url="http://www.canonware.com/jemalloc/" +depends=('glibc') +makedepends=('autoconf' 'make') +source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/bin/{,jemalloc-}pprof + chmod 644 "$pkgdir"/usr/lib/*.a + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +sha256sums=('35c433cc1df5cdf9eb58b7980338552fc1d7aa64f89fe5643a972ccedb7cf20a') diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 12b2c07a0..5eebe2071 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86857 2013-03-23 08:32:34Z fyan $ +# $Id: PKGBUILD 88087 2013-04-11 09:30:02Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse <yangtsesu@gmail.com> # Contributor: WU Jun <quark at lihdd dot net> pkgname=libpinyin -pkgver=0.8.93 -pkgrel=2 +pkgver=0.9.0 +pkgrel=1 pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64') url="https://github.com/libpinyin/libpinyin" @@ -13,13 +13,11 @@ license=('GPL') depends=('db' 'glib2') options=(!libtool) source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" - "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz" - "https://github.com/epico/libpinyin/commit/00fec992f5c760f546a1db933fb08325fc9cccbf.patch") + "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz") noextract=("model5.text.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../00fec992f5c760f546a1db933fb08325fc9cccbf.patch cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am @@ -32,6 +30,5 @@ package() { cd "${srcdir}/libpinyin-$pkgver" make DESTDIR="${pkgdir}" install } -md5sums=('1d9a768496c8a4368d3488639cadd554' - 'a83812e2d3be5695be54f95d9d7a3aa0' - '2163a85183c36f69d65d19b2bc9e2c9b') +md5sums=('e2237be88c6b9f1ed4f7c6e75a1738b4' + 'a83812e2d3be5695be54f95d9d7a3aa0') diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index daf096264..f6493bd0d 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 78891 2012-10-26 13:18:06Z spupykin $ +# $Id: PKGBUILD 88089 2013-04-11 09:34:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog -pkgver=1.0pre3 -pkgrel=5 +pkgver=20130411 +pkgrel=1 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") arch=('i686' 'x86_64') +makedepends=('git') options=('docs') backup=('etc/mcelog/mcelog.conf') -#source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("git://github.com/andikleen/mcelog.git" "${pkgname}.rc" "mcelog.service") -md5sums=('b42f2214de6f4feb992556149edc67fa' +md5sums=('SKIP' 'f039a77d7bde3518d3d695b144816e8a' - 'a8859012781f017624bbfe61c9d700bb') + 'b71eb82e532aed3918ebf6b30e158e7f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/mcelog" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/mcelog" mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service index c689bee77..35c18bc6f 100644 --- a/community/mcelog/mcelog.service +++ b/community/mcelog/mcelog.service @@ -3,8 +3,8 @@ Description=Machine Check Exception Logging Daemon After=syslog.target [Service] -PIDFile=/var/run/mcelog.pid -ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /var/run/mcelog.pid +PIDFile=/run/mcelog.pid +ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid StandardOutput=syslog [Install] diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index 416123bbf..3ac9403db 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74302 2012-07-24 10:33:15Z svenstaro $ +# $Id: PKGBUILD 88083 2013-04-11 08:51:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=3.2 -pkgrel=3 +pkgver=3.3 +pkgrel=1 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64') url="http://nbd.sourceforge.net" @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('9cafce4ecfb55e670d7ded4c8f4e6bc9' +md5sums=('cde8fe6e870b8a7459f12e5dcf572d86' '2d05d426b8c2708d5f8a0d028fcbae05' 'e7b13a8b3369e11927d9917664557efa' '5d1acc143018117174f79eff15afa038') diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index 054391d02..e23f369d5 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 85918 2013-03-08 23:40:43Z foutrelis $ +# $Id: PKGBUILD 88091 2013-04-11 09:41:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64') license=('LGPL') url="https://fedorahosted.org/netcf/" -depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl') +depends=('augeas>=0.7.4' 'netctl' 'libxslt' 'libxml2' 'libnl') makedepends=('gcc') options=(!libtool) source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz") diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index f40aad0d0..f6e65de1a 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87057 2013-03-26 13:09:29Z mtorromeo $ +# $Id: PKGBUILD 88094 2013-04-11 13:45:38Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.30_rel30.1 -pkgrel=3 +pkgver=5.5.30_rel30.2 +pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') @@ -97,7 +97,7 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('7309cf2645a1b45a17d6dbfda8c96b00e1186f3b9aba7f8692da14b52f98fb3b' +sha256sums=('d30876033cd5590f8e1d68aff6a2eaad677dbe59168d4610c580c4e4e2e923a7' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD index 750c55f46..3c4bbffee 100644 --- a/community/smem/PKGBUILD +++ b/community/smem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86144 2013-03-12 08:52:17Z cinelli $ +# $Id: PKGBUILD 88078 2013-04-11 05:47:45Z cinelli $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Dave Reisner <d@falconindy.com> # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org> # Contributor: Sebastien Duquette <ekse.0x@gmail.com> pkgname=smem -pkgver=1.2 +pkgver=1.3 pkgrel=1 pkgdesc="Generate reports on memory usage." url="http://www.selenic.com/smem/" @@ -14,7 +14,7 @@ depends=('python2') optdepends=('python2-matplotlib: for chart generation') arch=('i686' 'x86_64') source=("http://www.selenic.com/smem/download/$pkgname-$pkgver.tar.gz") -md5sums=('b8975840a08172ba8a1abbe7cb202dfe') +md5sums=('dd849102610aadb9f64379db09e73d41') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD deleted file mode 100644 index 22ea8ca2b..000000000 --- a/community/xvba-video-open/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 85947 2013-03-09 21:11:01Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Jesse Jaara <gmail.com: jesse.jaara> - -pkgname=xvba-video-open -pkgver=0.8.0 -pkgrel=2 -pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards" -arch=('i686' 'x86_64') -url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/" -license=('GPL2') -depends=('catalyst-utils' 'libva') -makedepends=('mesa') -options=(!libtool) -source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz - http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz - xvba-video-h264-level51.patch - xvba-video-0.8.0-glx-fix.patch - fix-build-with-glext.h-version-85.patch) -md5sums=('d9ddec2e7f02c1fa533773918e88e311' - 'b8f56bc55aa70cb19dd12857fdc184cc' - 'bce1de0a8b274049568453a53e8fce6a' - '5dc283eab46418eeef8e8be7c028a2ba') - -build() { - cd "${srcdir}/xvba-video-${pkgver}" - - # patch from opensuse (thanks vi0l0!) - patch -Np1 -i ../xvba-video-h264-level51.patch - patch -Np1 -i ../xvba-video-0.8.0-glx-fix.patch - - patch -Np1 -i ../fix-build-with-glext.h-version-85.patch - - export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include" - - ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr - make PYTHON=python2 -} - -package() { - cd "${srcdir}/xvba-video-${pkgver}" - - make DESTDIR="${pkgdir}" install -} -md5sums=('d9ddec2e7f02c1fa533773918e88e311' - 'b8f56bc55aa70cb19dd12857fdc184cc' - 'bce1de0a8b274049568453a53e8fce6a' - '5dc283eab46418eeef8e8be7c028a2ba' - '69e8a9027affbaf7066e35bc97b3a984') diff --git a/community/xvba-video-open/fix-build-with-glext.h-version-85.patch b/community/xvba-video-open/fix-build-with-glext.h-version-85.patch deleted file mode 100644 index f3cabce50..000000000 --- a/community/xvba-video-open/fix-build-with-glext.h-version-85.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru xvba-video-0.8.0/src/utils_glx.h xvba-video-0.8.0.patched/src/utils_glx.h ---- xvba-video-0.8.0/src/utils_glx.h 2011-06-14 13:07:13.000000000 +0200 -+++ xvba-video-0.8.0.patched/src/utils_glx.h 2013-02-17 10:53:34.589818821 +0100 -@@ -25,6 +25,13 @@ - #include <GL/glext.h> - #include <GL/glx.h> - -+#if GL_GLEXT_VERSION >= 85 -+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED -+ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h> -+ Redefine the type here as an interim solution */ -+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -+#endif -+ - #ifndef GL_FRAMEBUFFER_BINDING - #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT - #endif diff --git a/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch b/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch deleted file mode 100644 index 7cb249a16..000000000 --- a/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xvba-video-0.8.0/src/xvba_image.c xvba-video-0.8.0-patched/src/xvba_image.c ---- xvba-video-0.8.0/src/xvba_image.c 2011-06-14 13:07:13.000000000 +0200 -+++ xvba-video-0.8.0-patched/src/xvba_image.c 2012-07-22 14:55:14.186667413 +0200 -@@ -423,7 +423,7 @@ - } - - #if USE_GLX --const HWImageHooks hw_image_hooks_glx attribute_hidden; -+extern const HWImageHooks hw_image_hooks_glx attribute_hidden; - #endif - - // Commit image to the HW diff --git a/community/xvba-video-open/xvba-video-h264-level51.patch b/community/xvba-video-open/xvba-video-h264-level51.patch deleted file mode 100644 index a617a90ab..000000000 --- a/community/xvba-video-open/xvba-video-h264-level51.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -rup xvba-video.orig/src/xvba_buffer.c xvba-video/src/xvba_buffer.c ---- xvba-video.orig/src/xvba_buffer.c 2011-09-08 03:17:28.000000000 +0200 -+++ xvba-video/src/xvba_buffer.c 2012-07-03 21:38:04.851465348 +0200 -@@ -368,23 +368,18 @@ translate_VAPictureParameterBufferH264( - obj_context->picture_height - ); - -- /* Check for H.264 content over HP@L4.1 */ -+ /* Check for wrongly coded H264 Level 41 -+ adjust profile to Level 51 when reframes are too many -+ */ - unsigned int num_ref_frames = pic_param->num_ref_frames; -- if (profile == XVBA_H264_HIGH && level > 41) { -- if (!driver_data->warn_h264_over_hp_l41) { -- driver_data->warn_h264_over_hp_l41 = 1; -- xvba_information_message( -- "driver does not support H.264 content over HP@L4.1. " -- "Please upgrade.\n" -- ); -- } -+ if (profile == XVBA_H264_HIGH && level == 41) { - -- /* Use fail-safe values (lower ref frames) */ -+ /* Increase Level to decode pseudo Level 41 as Level 51 */ - const unsigned int mbw = pic_param->picture_width_in_mbs_minus1 + 1; - const unsigned int mbh = (obj_context->picture_height + 15) / 16; - const unsigned int max_ref_frames = 12288 * 1024 / (mbw * mbh * 384); - if (max_ref_frames < num_ref_frames) -- num_ref_frames = max_ref_frames; -+ level = 51; - } - - XVBABufferDescriptor * const xvba_buffer = obj_surface->pic_desc_buffer; diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 3c77f53ed..137f6f714 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=200 +pkgver=201 pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -17,17 +17,21 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' 'use-split-usr-path.patch') -md5sums=('5584b96e55c46217dab4c1768d10a472' +md5sums=('3e758392ff0e9206b3f7ee252b4a654b' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' '76bf83fe34c5b40533abc5dc940576a6') -build() { +prepare() { cd "$pkgname-$pkgver" # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" +} + +build() { + cd "$pkgname-$pkgver" ./configure \ --enable-static \ @@ -45,9 +49,9 @@ build() { make } -#check() { -# make -C "$pkgname-$pkgver" check -#} +check() { + make -C "$pkgname-$pkgver" check +} package_systemd() { pkgdesc="system and service manager" diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index e1719ecc2..01a03ef63 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 180842 2013-03-26 21:39:25Z schiv $ +# $Id: PKGBUILD 182614 2013-04-11 09:00:27Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour -pkgver=3.0 +_pkgname=Ardour3 +pkgver=3.1 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -16,14 +17,18 @@ makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('2759df2ac29e6075e006cc5b262bfee0' +md5sums=('6291ee6e6519a801a6c7255eb005895f' '316bd21ece5e2208a104fd09cac521af') -build() { - cd "$pkgname-$pkgver" +prepare() { + cd "$srcdir/$_pkgname-$pkgver" # python2 fix sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" python2 waf configure --prefix=/usr \ --configdir=/etc \ @@ -33,7 +38,7 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" python2 waf install --destdir="$pkgdir" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 1a3759c0b..007b3ce5f 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180802 2013-03-26 11:49:30Z foutrelis $ +# $Id: PKGBUILD 182625 2013-04-11 16:04:29Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -17,8 +17,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.6.2 -pkgrel=3 +pkgver=2.6.3 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -28,7 +28,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('1c2feb12677ee71eb2e428e589b33862') +md5sums=('90d6bb619191abbcc94094379d47e225') build() { mkdir build diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD index 91f6eb78e..f715412f1 100644 --- a/extra/libmpdclient/PKGBUILD +++ b/extra/libmpdclient/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 153242 2012-03-12 13:45:57Z bisson $ +# $Id: PKGBUILD 182606 2013-04-10 23:43:13Z bisson $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libmpdclient -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' -url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient' +url='http://www.musicpd.org/libs/libmpdclient/' license=('custom:BSD') arch=('i686' 'x86_64') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('7e23c760296fe47e9e4108a0eba6fef08cfe4db8') + options=('!libtool') -source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('f97e35525851eb192d3799f0dabe32915c56b96b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --disable-documentation make } diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD index cb4eeae22..8e7c3216e 100644 --- a/extra/mpc/PKGBUILD +++ b/extra/mpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154004 2012-03-21 10:52:38Z bisson $ +# $Id: PKGBUILD 182608 2013-04-10 23:44:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,16 +6,17 @@ # Contributor: Link Dupont <link@subpop.net> pkgname=mpc -pkgver=0.22 -pkgrel=2 +pkgver=0.23 +pkgrel=1 pkgdesc='Minimalist command line interface to MPD' -url='http://mpd.wikia.com/wiki/Client:Mpc' +url='http://www.musicpd.org/clients/mpc/' license=('GPL2') arch=('i686' 'x86_64') -options=('!emptydirs') depends=('libmpdclient') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e35414c1f5b25f4e500ceae125adb5bb9063b029') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('25d217b699fd70fd9b65b8b820addf794a109a9c') + +options=('!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 1762049e5..f89dc5a0a 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179309 2013-03-05 11:03:53Z bisson $ +# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,32 +6,25 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.17.3 -pkgrel=3 +pkgver=0.17.4 +pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' -url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' +url='http://www.musicpd.org/' license=('GPL') arch=('i686' 'x86_64') depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl') makedepends=('doxygen') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'ffmpeg.patch' - 'tmpfiles.d' - 'rc.d') -sha1sums=('f684d73a7517371a4461afdb2439f9533b51a49d' - '8a06d04bfdf4e0dc43479907dc9b3bd7fba6dd10' - 'f4d5922abb69abb739542d8e93f4dfd748acdad7' - '3470d489565f0ed479f1665dd2876f66acb5a585') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" + 'tmpfiles.d') +sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb' + 'f4d5922abb69abb739542d8e93f4dfd748acdad7') backup=('etc/mpd.conf') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../ffmpeg.patch - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -41,25 +34,20 @@ build() { --enable-pulse \ --disable-sidplay \ --with-systemdsystemunitdir=/usr/lib/systemd/system - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - + install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists + install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf sed \ -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ -e '/^#user/c user "mpd"' \ - -i doc/mpdconf.example - - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd - install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf + -i "${pkgdir}"/etc/mpd.conf } diff --git a/extra/mpd/ffmpeg.patch b/extra/mpd/ffmpeg.patch deleted file mode 100644 index 83b13d80f..000000000 --- a/extra/mpd/ffmpeg.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur old/src/decoder/ffmpeg_decoder_plugin.c new/src/decoder/ffmpeg_decoder_plugin.c ---- old/src/decoder/ffmpeg_decoder_plugin.c 2013-01-07 11:39:40.000000000 +1100 -+++ new/src/decoder/ffmpeg_decoder_plugin.c 2013-03-05 21:54:27.116585462 +1100 -@@ -395,6 +395,11 @@ - #endif - return SAMPLE_FORMAT_S32; - -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) -+ case AV_SAMPLE_FMT_FLTP: -+ return SAMPLE_FORMAT_FLOAT; -+#endif -+ - default: - break; - } diff --git a/extra/mpd/rc.d b/extra/mpd/rc.d deleted file mode 100755 index f00e16067..000000000 --- a/extra/mpd/rc.d +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Music Player Daemon' - /usr/bin/mpd /etc/mpd.conf &> /dev/null && - { add_daemon mpd; stat_done; } || stat_fail - ;; - stop) - stat_busy 'Stopping Music Player Daemon' - /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null && - { rm_daemon mpd; stat_done; } || stat_fail - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 8490915a6..044d675db 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $ +# $Id: PKGBUILD 182637 2013-04-11 18:36:34Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') +pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') @@ -14,16 +14,14 @@ url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') makedepends=('cmake' 'python2-numpy' 'mesa' - 'opencl-headers' 'eigen2' - 'texlive-bin' 'python2-sphinx') # for docs -optdepends=('opencv-docs' - 'opencv-samples' + 'opencl-headers' 'eigen2') +optdepends=('opencv-samples' 'eigen2' 'python2-numpy: Python 2.x interface') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' 'fsh.patch') -md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9' +md5sums=('8eac87462c7bec8b89021b723207c623' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -31,10 +29,6 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' '-D WITH_TBB=ON' '-D WITH_XINE=ON' - '-D ENABLE_SSE=OFF' - '-D ENABLE_SSE2=OFF' - '-D ENABLE_SSE3=OFF' - '-D BUILD_DOCS=ON' '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' @@ -46,8 +40,17 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D CMAKE_INSTALL_PREFIX=/usr' '-D CMAKE_SKIP_RPATH=ON') -build() { - cd "$srcdir/$_realname-$pkgver" +# SSE only available from Pentium 3 onwards (i686 is way older) +[[ "$CARCH" = 'i686' ]] && \ + _cmakeopts+=('-D ENABLE_SSE=OFF' + '-D ENABLE_SSE2=OFF' + '-D ENABLE_SSE3=OFF') + +# all x64 CPUs support SSE2 but not SSE3 +[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 @@ -58,8 +61,13 @@ build() { # see http://code.opencv.org/issues/2512 patch -Np1 -i "$srcdir/fsh.patch" - # python2 compatibility for generating docs - sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake + # no longer including docs, see https://bugs.archlinux.org/task/34185 + # python2 compatibility for generating (html) docs + #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake +} + +build() { + cd "$srcdir/$pkgname-$pkgver" cmake ${_cmakeopts[@]} . @@ -67,58 +75,28 @@ build() { } package_opencv() { - cd "$srcdir/$_realname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd "$pkgdir/usr/share" - # separate docs package; also be -R friendly - [[ -d doc ]] && mv doc "$srcdir/opencv-doc" - - # separate samples package + # separate samples package; also be -R friendly [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" } -package_opencv-docs() { - pkgdesc+=" (documentation)" - unset depends - unset optdepends - options=('docs') - - # PDFs are not being generated for some reason as of 2.4.4 - # even after adding latex and sphinx deps - # when previously without them there were a couple of good docs installed - - cd "$srcdir" - - # doc dir now includes opencv subdir (looks like they finally listened) - cp -r opencv-doc "$pkgdir/usr/share/doc" - - # install license file - #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - package_opencv-samples() { pkgdesc+=" (samples)" depends=('bash') unset optdepends unset options - cd "$srcdir" - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" - - # Do we really need licenses for these minor splits? - # install license file - #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" } # vim:set ts=2 sw=2 et: diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index e9cf73b33..658ae50e7 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 180690 2013-03-25 19:15:43Z bpiotrowski $ +# $Id: PKGBUILD 182619 2013-04-11 11:34:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 pkgname=('qt5-base' 'qt5-declarative' + 'qt5-doc' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-jsbackend' @@ -15,8 +16,8 @@ pkgname=('qt5-base' 'qt5-translations' 'qt5-webkit' 'qt5-xmlpatterns') -pkgver=5.0.1 -pkgrel=10 +pkgver=5.0.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -31,12 +32,13 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'use-python2.patch') -md5sums=('00a577bd88e682d1b4d01d41d1d699cf' + 'use-python2.patch' 'gcc48.patch') +md5sums=('2cab3518d86fe8f0638c7faea8b46397' 'f1837a03fd0ebbd2da58975845f278e3' '480fea1ed076992b688373c8db274be0' '5595c24d5bb942c21e3a4d299e6d0bf1' - 'ec3133b093550f16a21bb91e5f0f2943') + 'd6ab43fb371be494e3bfd9b210c40bf1' + '7927028e2374321c78a76df858e723d6') build() { cd ${_pkgfqn} @@ -54,10 +56,16 @@ build() { -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') + # GCC 4.8 fixes + cd qtbase + patch -p1 -i "${srcdir}"/gcc48.patch + cd ../ + ./configure -confirm-license -opensource \ -prefix /usr \ + -bindir /usr/lib/qt/bin \ -docdir /usr/share/doc/qt \ - -headerdir /usr/include/qt5 \ + -headerdir /usr/include/qt \ -archdatadir /usr/lib/qt \ -datadir /usr/share/qt \ -sysconfdir /etc/xdg \ @@ -74,13 +82,25 @@ build() { -reduce-relocations make + + # build docs + make docs + + # build examples + for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ + qtwebkit-examples-and-demos qtxmlpatterns; do + cd ${m}/examples + ${QTDIR}/qmake + make + cd ../../ + done } package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils' 'icu') + 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' @@ -102,6 +122,12 @@ package_qt5-base() { # Fix wrong qmake path in pri file sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done } package_qt5-declarative() { @@ -115,6 +141,32 @@ package_qt5-declarative() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-doc() { + pkgdesc='A cross-platform application and UI framework (Documentation and Examples)' + depends=('qt5-base') + conflicts=('qt-doc') + replaces=('qt-doc') + provides=('qt-doc') + options=('docs') + groups=() + + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install_docs + + for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ + qtwebkit-examples-and-demos qtxmlpatterns; do + cd ${m}/examples + make INSTALL_ROOT="${pkgdir}" install + cd ../../ + done } package_qt5-jsbackend() { @@ -140,6 +192,12 @@ package_qt5-xmlpatterns() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done } package_qt5-translations() { @@ -250,6 +308,12 @@ package_qt5-tools() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done } package_qt5-webkit() { diff --git a/extra/qt5/gcc48.patch b/extra/qt5/gcc48.patch new file mode 100644 index 000000000..03b205b68 --- /dev/null +++ b/extra/qt5/gcc48.patch @@ -0,0 +1,63 @@ +# Author: David E. Narváez <david.narvaez@computer.org> +# AuthorDate: 2013-02-23 23:14:50 -0500 +# Commit: David E. Narváez <david.narvaez@computer.org> +# CommitDate: 2013-02-23 23:14:50 -0500 +# +# Rename qAbs Function for timeval +# +# This decouples it from qAbs which is declared as a constexpr under +# certain compilation flags and enables for qtbase to be compiled with +# GCC 4.8 +# +# Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 +diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp +index 0eee425..7a29247 100644 +--- a/src/corelib/kernel/qtimerinfo_unix.cpp ++++ b/src/corelib/kernel/qtimerinfo_unix.cpp +@@ -87,22 +87,21 @@ + firstTimerInfo = 0; + } + + timeval QTimerInfoList::updateCurrentTime() + { + return (currentTime = qt_gettime()); + } + + #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) + +-template <> +-timeval qAbs(const timeval &t) ++timeval qAbsTimeval(const timeval &t) + { + timeval tmp = t; + if (tmp.tv_sec < 0) { + tmp.tv_sec = -tmp.tv_sec - 1; + tmp.tv_usec -= 1000000; + } + if (tmp.tv_sec == 0 && tmp.tv_usec < 0) { + tmp.tv_usec = -tmp.tv_usec; + } + return normalizedTimeval(tmp); +@@ -137,21 +136,21 @@ + *delta = elapsedTime - elapsedTimeTicks; + + previousTicks = currentTicks; + previousTime = currentTime; + + // If tick drift is more than 10% off compared to realtime, we assume that the clock has + // been set. Of course, we have to allow for the tick granularity as well. + timeval tickGranularity; + tickGranularity.tv_sec = 0; + tickGranularity.tv_usec = msPerTick * 1000; +- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); ++ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); + } + + /* + repair broken timer + */ + void QTimerInfoList::timerRepair(const timeval &diff) + { + // repair all timers + for (int i = 0; i < size(); ++i) { + register QTimerInfo *t = at(i); diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch index 8a7075a97..eb53b10f6 100644 --- a/extra/qt5/use-python2.patch +++ b/extra/qt5/use-python2.patch @@ -94,3 +94,14 @@ message_receiver_generator.input = MESSAGE_RECEIVERS message_receiver_generator.depends = $$SCRIPTS message_receiver_generator.output_function = message_receiver_generator_output +--- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-04-11 08:05:15.149214600 +0000 ++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-04-11 08:05:28.829105110 +0000 +@@ -116,7 +116,7 @@ + production_build:blackberry { + addReasonForSkippingBuild("Build not supported on BB10 yet.") + } +- requiredPrograms = gperf python perl bison ruby flex ++ requiredPrograms = gperf python2 perl bison ruby flex + for(program, requiredPrograms): \ + !programExistsInPath($$program): \ + addReasonForSkippingBuild("Missing $$program from PATH") diff --git a/extra/qtchooser/3.conf b/extra/qtchooser/3.conf new file mode 100644 index 000000000..bea263c91 --- /dev/null +++ b/extra/qtchooser/3.conf @@ -0,0 +1,2 @@ +/usr/lib/qt3/bin +/usr/lib diff --git a/extra/qtchooser/4.conf b/extra/qtchooser/4.conf new file mode 100644 index 000000000..96e344eba --- /dev/null +++ b/extra/qtchooser/4.conf @@ -0,0 +1,2 @@ +/usr/lib/qt4/bin +/usr/lib diff --git a/extra/qtchooser/5.conf b/extra/qtchooser/5.conf new file mode 100644 index 000000000..bcd76decb --- /dev/null +++ b/extra/qtchooser/5.conf @@ -0,0 +1,2 @@ +/usr/lib/qt/bin +/usr/lib diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD new file mode 100644 index 000000000..d288fb09d --- /dev/null +++ b/extra/qtchooser/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 182622 2013-04-11 12:14:29Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=qtchooser +pkgver=26 +pkgrel=3 +pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' +arch=('i686' 'x86_64') +url='http://qt.gitorious.org/qt/qtchooser' +license=('GPL') +depends=('gcc-libs') +source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz" + {3,4,5}.conf) +md5sums=('a188a5cb63113130e0d05fe4d5bf4e95' + '7c5da2b7911d1c4fabc63d6ef00f0020' + 'aa4d49b269e1b806f5eea170801f0aa6' + 'cf83f09a9a5a44d898b93f624d74dd11') + +build() { + cd ${pkgname}-${pkgver}-g97962d2 + make +} + +package() { + cd ${pkgname}-${pkgver}-g97962d2 + make INSTALL_ROOT="${pkgdir}" install + + install -d "${pkgdir}"/etc/xdg/qtchooser + install -m644 "${srcdir}"/{3,4,5}.conf \ + "${pkgdir}"/etc/xdg/qtchooser/ + + # Set the default Qt + ln -s /etc/xdg/qtchooser/5.conf \ + "${pkgdir}"/etc/xdg/qtchooser/default.conf +} diff --git a/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch new file mode 100644 index 000000000..4ca4fc704 --- /dev/null +++ b/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -0,0 +1,281 @@ +From: Mike Hommey <mh@glandium.org>
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index 0e8ccf5..fa46c08 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -249,7 +249,7 @@ var MigrationWizard = {
+ }
+
+ var brandBundle = document.getElementById("brandBundle");
+- // These strings don't exist when not using official branding. If that's
++ // These strings may not exist when not using official branding. If that's
+ // the case, just skip this page.
+ try {
+ var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
+@@ -281,8 +281,8 @@ var MigrationWizard = {
+ case "chrome":
+ source = "sourceNameChrome";
+ break;
+- case "firefox":
+- source = "sourceNameFirefox";
++ case "self":
++ source = "brand";
+ break;
+ }
+
+@@ -292,7 +292,12 @@ var MigrationWizard = {
+ var oldHomePageURL = this._migrator.sourceHomePageURL;
+
+ if (oldHomePageURL && source) {
+- var appName = MigrationUtils.getLocalizedString(source);
++ var appName;
++ if (source == "brand") {
++ appName = brandBundle.GetStringFromName("brandFullName");
++ } else {
++ appName = MigrationUtils.getLocalizedString(source);
++ }
+ var oldHomePageLabel =
+ brandBundle.getFormattedString("homePageImport", [appName]);
+ var oldHomePage = document.getElementById("oldHomePage");
+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
+index f030756..23e37ff 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -42,7 +42,7 @@
+ #elifdef XP_UNIX
+ <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
+ #endif
+- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
++ <radio id="self" hidden="true"/>
+ <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
+ </radiogroup>
+ <label id="noSources" hidden="true">&noMigrationSources.label;</label>
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index d7fec75..d531b83 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+ #ifdef HAS_IE_MIGRATOR
+ component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index 52722e9..0448444 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
+
+
+ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
+-FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
++FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
+ FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
+
+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
+index 401623a..4ce7a3e 100644
+--- a/browser/components/migration/src/MigrationUtils.jsm
++++ b/browser/components/migration/src/MigrationUtils.jsm
+@@ -404,11 +404,6 @@ this.MigrationUtils = Object.freeze({
+ * @see nsIStringBundle
+ */
+ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
+- const OVERRIDES = {
+- "4_firefox": "4_firefox_history_and_bookmarks"
+- };
+- aKey = OVERRIDES[aKey] || aKey;
+-
+ if (aReplacements === undefined)
+ return getMigrationBundle().GetStringFromName(aKey);
+ return getMigrationBundle().formatStringFromName(
+@@ -623,6 +618,17 @@ this.MigrationUtils = Object.freeze({
+ },
+
+ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ canMigrate:
++ function MU_canMigrate(aMigratorKey) {
++ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++ },
++
++ /**
+ * Cleans up references to migrators and nsIProfileInstance instances.
+ */
+ finishMigration: function MU_finishMigration() {
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index f67823b..36016b8 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -12,6 +12,7 @@ function ProfileMigrator() {
+
+ ProfileMigrator.prototype = {
+ migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
++ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
+ QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
+ classDescription: "Profile Migrator",
+ contractID: "@mozilla.org/toolkit/profile-migrator;1",
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 21cf405..f3c1a6b 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -17,8 +17,6 @@
+ <!ENTITY importFromSafari.accesskey "S">
+ <!ENTITY importFromChrome.label "Chrome">
+ <!ENTITY importFromChrome.accesskey "C">
+-<!ENTITY importFromFirefox.label "Firefox">
+-<!ENTITY importFromFirefox.accesskey "X">
+
+ <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
+
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 260bc29..52b32cc 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -8,7 +8,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+
+ importedBookmarksFolder=From %S
+
+@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
+ 2_ie=Cookies
+ 2_safari=Cookies
+ 2_chrome=Cookies
+-2_firefox=Cookies
++2_self=Cookies
+
+ 4_ie=Browsing History
+ 4_safari=Browsing History
+ 4_chrome=Browsing History
+-4_firefox_history_and_bookmarks=Browsing History and Bookmarks
++4_self=Browsing History and Bookmarks
+
+ 8_ie=Saved Form History
+ 8_safari=Saved Form History
+ 8_chrome=Saved Form History
+-8_firefox=Saved Form History
++8_self=Saved Form History
+
+ 16_ie=Saved Passwords
+ 16_safari=Saved Passwords
+ 16_chrome=Saved Passwords
+-16_firefox=Saved Passwords
++16_self=Saved Passwords
+
+ 32_ie=Favorites
+ 32_safari=Bookmarks
+@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
+ 64_ie=Other Data
+ 64_safari=Other Data
+ 64_chrome=Other Data
+-64_firefox=Bookmarks Backups
++64_self=Bookmarks Backups
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index fa45115..1fcf3cd 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -42,7 +42,7 @@ toolkit.jar:
+ + content/global/mozilla.xhtml (mozilla.xhtml)
+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/resetProfile.css (resetProfile.css)
+-* content/global/resetProfile.js (resetProfile.js)
++ content/global/resetProfile.js (resetProfile.js)
+ content/global/resetProfile.xul (resetProfile.xul)
+ content/global/resetProfileProgress.xul (resetProfileProgress.xul)
+ content/global/treeUtils.js (treeUtils.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index dcb4065..09c1146 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -36,13 +36,13 @@ function resetSupported() {
+ getService(Ci.nsIToolkitProfileService);
+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
+ try {
+- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
+- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ return ("canMigrate" in pm) && pm.canMigrate("self");
++ }
+ } catch (e) {
+ // Catch exception when there is no selected profile.
+ Cu.reportError(e);
+@@ -53,9 +53,6 @@ function resetSupported() {
+ function getMigratedData() {
+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
+
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-
+ // From migration.properties
+ const MIGRATED_TYPES = [
+ 4, // History and Bookmarks
+@@ -68,7 +65,7 @@ function getMigratedData() {
+ let dataTypes = [];
+ for (let itemID of MIGRATED_TYPES) {
+ try {
+- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
+ dataTypes.push(typeName);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist.
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index f35c227..7062886 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
+ * @client Toolkit (Startup code)
+ * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
+ */
+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
+ interface nsIProfileMigrator : nsISupports
+ {
+ /**
+@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
+ * @note The startup code ignores COM exceptions thrown from this method.
+ */
+ void migrate(in nsIProfileStartup aStartup, in ACString aKey);
++
++ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ bool canMigrate(in ACString aKey);
+ };
+
+ %{C++
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 7665de2..4588f4a 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun()
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ }
+ pm->Migrate(&mDirProvider, aKey);
+ }
diff --git a/libre-testing/iceweasel-libre/PKGBUILD b/libre-testing/iceweasel-libre/PKGBUILD index 2998ebae9..920a70c83 100644 --- a/libre-testing/iceweasel-libre/PKGBUILD +++ b/libre-testing/iceweasel-libre/PKGBUILD @@ -1,146 +1,90 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> +# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> # Contributor (Parabola): André Silva <emulatorman@lavabit.com> - -# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> - -# Maintainer (Arch) : Ionut Biru <ibiru@archlinux.org> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> - -# Contributor: Figue <ffigue at gmail> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> -# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> - -lowercase() { tr A-Z a-z <<<"$*"; } +# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -# Version Configuration ############################################## - -_pgo=false +_pgo=true +# We're getting this from Debian Experimental _debname=iceweasel -_debver=18.0 +_debver=20.0.1 _debrel=1 -_debrepo=http://ftp.debian.org/debian/pool/main +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=iceweasel +pkgname=iceweasel-libre +pkgver=$_debver.$_debrel +pkgrel=1 + +pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." +arch=(i686 x86_64 mips64el) +license=(MPL GPL LGPL) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) +[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') +if $_pgo; then + makedepends+=(xorg-server-xvfb) + options=(!ccache) +fi -# locales can be easily generated by running -# $ sed -rn 's/.*-l10n-([^.]*)\..*/\1/p' src/*.dsc | sort -u -_locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij 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) +optdepends=('networkmanager: Location detection via available WiFi networks') +url="http://packages.debian.org/experimental/${_pkgname}" +install=iceweasel.install +replaces=('firefox') +conflicts=('firefox') +provides=('firefox') +source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" + "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" + mozconfig + mozconfig.pgo + libre.patch + iceweasel.desktop + iceweasel-install-dir.patch + vendor.js + shared-libs.patch + replace-urls.txt + Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) +md5sums=('22daa24b6490c654f131550cbf20fad3' + '0c70ab52f35701558081df3d360361a2' + 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' + '383e8e2a97a8b13fe56d153adb6878b6' + '5addd418bf32b673fdfe80c8fefbea1a' + '7b9e5996dd9fe0b186a43a297db1c6b5' + 'abf5ecb74caa857abb42bcfbb3442d9c' + '6dd547c72bb875a3101135a1c32d4783' + '52e52f840a49eb1d14be1c0065b03a93' + 'a8fc4658d45b6bf9350023e5c3f34e56' + 'd0e1f2625cd9f7234abdeb55aee00529') -pkgbase=iceweasel -pkgname=(iceweasel-libre) -for locale in "${_locales[@]}"; do - pkgname+=("iceweasel-libre-l10n-$(lowercase ${locale})") -done -pkgver=${_debver}.${_debrel} -pkgrel=3 +prepare() { + export DEBIAN_BUILD="mozilla-release" -###################################################################### + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' -debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } + mv debian "$srcdir/$DEBIAN_BUILD" + cd "$srcdir/$DEBIAN_BUILD" -if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi -if $_pgo; then pkgname+='-pgo'; fi -if [ "$pkgbase" != "$pkgname" ]; then - provides+=("$pkgbase=$pkgver") - conflicts+=("$pkgbase") -fi + # Doesn't apply and seems unimportant + rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true -pkgdesc="A libre version of Debian Iceweasel, the 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' - 'nss>=3.14.1' - 'sqlite' - 'startup-notification' -) -makedepends=( - 'autoconf2.13' - 'diffutils' - 'dpkg-devtools' - 'imagemagick' - 'imake' - 'libidl2' - 'librsvg' - 'libxslt' - 'mesa' - 'python2' - 'unzip' - 'zip' -) -[[ $CARCH != mips64el ]] && makedepends+=('yasm') -if $_pgo; then - makedepends+=('xorg-server-xvfb') - options+=(!ccache) -fi -optdepends=('networkmanager: Location detection via available WiFi networks') -url="http://packages.debian.org/source/experimental/$_debname" -install=firefox.install -options=(!emptydirs) -source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc) - $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz) - $(debfile ${_debname}_${_debver}.orig.tar.bz2) - $(debfile ${_debname}_${_debver}.orig-compare-locales.tar.bz2) - $(for locale in "${_locales[@]}"; do debfile ${_debname}_${_debver}.orig-l10n-${locale}.tar.bz2; done) - replace-urls.txt libre.patch mozconfig.pgo - mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch - bug677092.patch) -# use dpkg-source to extract everything -noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done - -# This is a bug, we should fix it. -mips64el-prepare() { - # Fix MIPS N32 support. - sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ - js/src/assembler/wtf/Platform.h - # Disable JIT. - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in -} -misp64el-configure() { - echo 'ac_add_options --disable-methodjit' >> .mozconfig - echo 'ac_add_options --disable-tracejit' >> .mozconfig - echo 'ac_add_options --disable-jemalloc' >> .mozconfig -} - -prepare() { - if [[ -d "/usr/lib/$pkgbase" ]]; then - error "Because of how rpath is set, this package cannot be installed during build" - return 1 - fi - dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release - cd mozilla-release + # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it + rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true - patch -Np1 -i ../iceweasel-install-dir.patch - patch -Np1 -i ../shared-libs.patch + quilt push -a - # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092 - # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468 - patch -Rp1 -i ../bug677092.patch + patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname + patch -Np1 -i "$srcdir/shared-libs.patch" # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do @@ -153,258 +97,115 @@ prepare() { fi done - # Liberate the locales - printf '%s\n' l10n-*/*/searchplugins/*.xml \ - | grep -Ev 'creativecommons|wikipedia|wikipediaro|wiktionary' \ - | xargs -d '\n' rm -f - for dir in l10n-*/*/searchplugins; do - pushd "$dir" - ls | sed -n 's/\.xml$//p' > list.txt - popd - done - find l10n-* -name 'region.properties' -delete - # Patch anything that's left - patch -Np1 -i ../libre.patch + patch -Np1 -i "$srcdir/libre.patch" + + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + + if $_pgo; then + cat "$srcdir/mozconfig.pgo" >> .mozconfig + fi + + # From js on abslibre-mips64el.git + if [ "$CARCH" = "mips64el" ]; then + msg "Force disabling JIT." + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} + + echo "ac_add_options --disable-methodjit" >> .mozconfig + echo "ac_add_options --disable-tracejit" >> .mozconfig + fi + + # This is a bug, we should fix it + if [ "$CARCH" = "mips64el" ]; then + # Fix MIPS N32 support. + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + js/src/assembler/wtf/Platform.h + # Disable JIT. + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in + echo 'ac_add_options --disable-methodjit' >> .mozconfig + echo 'ac_add_options --disable-tracejit' >> .mozconfig + echo 'ac_add_options --disable-jemalloc' >> .mozconfig + fi # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - if [[ $CARCH == mips64el ]]; then mips64el-prepare; fi - - touch "$srcdir/.makepkg-prepare" -} + mkdir "$srcdir/path" -build() { - [[ -f "$srcdir/.makepkg-prepare" ]] || { prepare || return $?; cd "$srcdir"; } - cd "$srcdir" - build_browser - for locale in "${_locales[@]}"; do - cd "$srcdir" - build_locale "${locale}" - done -} + # WebRTC build tries to execute "python" and expects Python 2 + ln -s /usr/bin/python2 "$srcdir/path/python" -build_browser() { - cd mozilla-release + # Use gold, as Mozilla can use some of its features, such as safe ICF + ln -s /usr/bin/ld.gold "$srcdir/path/ld" - cp ../mozconfig .mozconfig - if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi - if [[ $CARCH == mips64el ]]; then mips64el-configure; fi + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} - # WebRTC build tries to execute "python" and expects Python 2 - # Workaround taken from chromium PKGBUILD - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - export PATH="$srcdir/python2-path:$PATH" +build() { + cd "$srcdir/$DEBIAN_BUILD" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase" + export PATH="$srcdir/path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" 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 - kill $! || true + # Enable PGO for x86_64 and mips64el only. i686 currently has problems: + # Either segfaults since gcc 4.8, or the linker runs out of memory + # If you discover that PGO again works on i686, please file a bug + if [[ $CARCH != i686 ]]; then + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build MOZ_PGO=1 || _fail=1 + + kill $! || true + return $_fail + else + make -f client.mk build + fi + else + make -f client.mk build fi - return $_fail -} - -build_locale() { - locale=$1 - cd mozilla-release - - export PYTHON="/usr/bin/python2" - export PRODUCT='browser' - - # This is an adaptation of the "$(L10N_BUILD_STAMPS)" rule from debian/rules - [[ -e l10n ]] || mkdir -p l10n - [[ -e l10n/$locale ]] || ln -sf ../l10n-$locale l10n/$locale - ${PYTHON} config/pythonpath.py -I$(pwd)/compare-locales/lib \ - $(pwd)/compare-locales/scripts/compare-locales \ - -m $(pwd)/moz-objdir/l10n-$locale ${PRODUCT}/locales/l10n.ini $(pwd)/l10n $locale - make -C moz-objdir/${PRODUCT}/locales langpack-$locale \ - L10NBASEDIR=$(pwd)/l10n MOZ_CHROME_FILE_FORMAT=flat \ - MOZ_LANGPACK_EID=langpack-${locale}@${pkgbase}.mozilla.org \ - PKG_LANGPACK_BASENAME='$(MOZ_LANGPACK_EID)' PKG_LANGPACK_PATH=xpi/ \ - LOCALE_MERGEDIR=$(pwd)/moz-objdir/l10n-$locale -} - -install-icon() { - local brandingdir=$1 prog=$2 size=$3 - local sizedir=${size}x${size} ext=png - [[ $size == scalable ]] && { sizedir=$size; ext=svg; size=''; } - - dirs=({moz-objdir/,}"$brandingdir") - files=({default,mozicon,${prog}{,_icon}}${size}.${ext}) - - for dir in "${dirs[@]}"; do - for files in "${files[@]}"; do - if [[ -e "$dir/$file" ]]; then - install -Dm644 "$dir/$file" \ - "$pkgdir/usr/share/icons/hicolor/$sizedir/apps/$prog.png" - return 0 - fi - done - done - #return 1 } -package_iceweasel-libre() { - cd mozilla-release +package() { + cd "$srcdir/$DEBIAN_BUILD" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" - for size in 16 32 48 64 128 scalable; do - install-icon debian/branding $pkgbase $size + # I don't even know why we're hitting the objdir, and ConnOS didn't + _brandingdir=debian/branding + brandingdir=moz-objdir/$_brandingdir + icondir="$pkgdir/usr/share/icons/hicolor" + for i in 16x16 32x32 48x48 64x64; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" done + install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" + install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" - install -Dm644 ../$pkgbase.desktop \ - "$pkgdir/usr/share/applications/$pkgbase.desktop" + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" - # 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" + 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" # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl} + rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - #workaround for now - #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin" + # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } - -package_locale() { - locale=$1 - cd mozilla-release - lang=$(sed -n "/^%define L10N_LANG ${locale}/,+1p" debian/l10n/browser-l10n.control|sed -n 's/%define L10N_LANGUAGE\s\s*//p') - - pkgdesc="${lang} language package for Iceweasel-libre" - depends=("iceweasel-libre=${pkgver}") - - replaces=(iceweasel-i18n-$(lowercase "${locale}")) - conflicts=(iceweasel-i18n-$(lowercase "${locale}")) - - extdir="$pkgdir"/usr/lib/iceweasel/extensions/ - install -d "${extdir}" - install -m644 moz-objdir/dist/xpi/langpack-${locale}@${pkgbase}.mozilla.org.xpi "${extdir}" -} -for locale in "${_locales[@]}"; do - eval "package_iceweasel-libre-l10n-$(lowercase ${locale})() { package_locale ${locale}; }" -done - -md5sums=('263569a577f72314694a711cc6a0d96f' - '6a571d3a3b355c331f67d57702f4fccf' - '366e1e4847d7e00eba77ee5a4be0d3db' - '80dd4a702302fb36719c67445b487895' - 'c99d7605c0e0bb0d77e71cd54f305a9a' - '1f4aeabf6c28fcf6539d13f65f8b366b' - 'cb9cc5f721d81442f1a93d134054f23c' - 'c69e0fa169bf6c49b1f83afd2383b628' - '09f4376791d17a772c60a0308095211d' - 'a16081e4da9daf6df5f6fcce2000cec1' - '88dd4c5837485acea83e97f3cb4f1e31' - '8751f0a634656ba973c53f96d1fa34e1' - 'f4531f867e6e75501bac3d7ed5f09045' - '740667ba651f0562b45bbfe63b8ec84e' - 'a1f3637341457fb8272d126f1aa70e4b' - '3d00ad2734c890930441d6cd919f11c8' - '84b7a2bf7f1458b60e9552d04c7e84b2' - '30ce51ca764b091c59df5c08e35e8a7f' - '1291e5976c83a8cda1903e4443d44c8e' - '1eacf81985d9993b2b94f98fd4c453e0' - '07b91907c98155c1b95e5d7f47367fde' - 'cd4042405f6eaa2931021f745f49d91f' - '24f8a5d05d0d2485c30b46e6d6835330' - '1b95f32637229a86e4633994350cf76f' - 'ae6007384d85dbd14fbe6496e0b9e47b' - 'a8ef67c04d3dc263f0f58e877b13cd71' - 'b5c3b2e366aa776e574d0972df72a423' - '200f856b50a7485a1d5447cbf8dee77c' - '1767400f27cf010572308f949e56176e' - 'c6dde21438789ccf4c666afc22ee713c' - 'd202408658b9e7e7a2656dd874ac0712' - '1c463a18e2a395314f7d0ad72282d5aa' - 'ec222722f432e8a94f993c1c32cd9757' - 'cf44fd1d567a7638fc0b5b80bb0398f7' - '13151197d7ef349699e55c760c74af16' - '32c185ef506e439bb63f572906a9bf66' - '2e6b90b3c6cad17753ec1aecaf61073c' - 'dbf451ef9ecf1816973ac4dffe7e2b8e' - '85c0900fb798fb64a8883dba06deccc0' - '0efff47ab838fd320c710ffd46ee3a57' - '28e5d445e7a91ddd64d50478b05edb51' - '770dcdf1a8d6d2db64dadb6e4f6149fb' - '7732b021cdf73ace33cb41609b327f3d' - '3a195266b43e9f477619aac9c326a26b' - 'a55e22c7ab045826b331efd7c0f036ef' - '2edcd565c19828e3d4a2da19f8529edd' - '531c54a91d509e768b55bfd88a96a527' - 'ddf2182b6e33795450bf41f46e7be521' - '8bf4edabc95abbaf274ddd5e5c5db562' - '63a227dbab0e66b6a0d4804c419049e2' - '3c9bab1f629c0b079345a186c0f22afc' - '786a62179094cda5f5e831232f4f94ce' - '535f68d0cfa4dee9df0cddbee42a4c94' - 'ffc4c457dfa697162e4198e61ae19e3b' - '4476b94e676b3cfb309f972f7c42da1b' - '792700b40ba53de7de5b48187b604b29' - '7f71fa7bed8488226168406ac022d2fd' - 'fdd9a144cd2a630d1b7ab6b73315c548' - '88d668eccb111a9e4f5fde58e000a5aa' - '46509bb591bf54b6fed025814bfc11bf' - '715a3f8c2fcdab17b24ce61f55c49183' - '658226211d66a724d0335a173ef8512f' - 'ecb41c7536c95cf2ca118d7ab6b7d357' - 'b813931cfba36f3b00826ba2d36e648f' - '2a926d37294ab24a7d7dc879339ae736' - 'fba979124cd393f1164a59e3b9183ccc' - 'e8597a5af1643b9c9a0b02a3756e0a86' - '665140babab027228eb195b6c0e83d4e' - 'e71a740bfc52d25968f8e2c4c1896897' - '47bd00559728578bfc257b80c72ce393' - '3a3d846613363e6d4dd99326cd07417d' - '80daf692c2fa80ef7f528df2a6aed42e' - '25c03afb8f5086a07eb0e26c94bcbc01' - '481db49b914f33d6c594ecebbc291e4c' - '742d2af843536fc1cdc8560b5aa0620f' - '9ee935f09dc89b42db9ad8db3473717d' - 'cf3e65e4db50dfa467defb4f820cd378' - '3e0c8ea5b69c4363e40c21dda5230850' - '32b73226e95ae47dc11a554a7208d960' - '437602c23394eb02ae5fe03ca4fd29bc' - 'f7a347a3d5679d82340d227474de938f' - '1a898825183ed67ea72b67a2c3486dd4' - '73bead055152cd4885b9834691c9066a' - '722a0d2212060e2044cbac859db3e063' - 'fba01f51ac90dec18758a7468fb509e1' - '03c2a59eab8ef4ad3687b91c07f96165' - 'd502ec35e4ec26d7f538f4b96402fe9c' - 'b75b729e9ab3ff9a908115ab520339a9' - 'cd696e70fdb4f5ab9d50040abea46b82' - '1b9df937ef08b6a72ca7d659f91df099' - '17bbe91d26b302aa36391ed57199006d' - 'de6037c0a65e7b86e0929637156ba587' - 'a8fc4658d45b6bf9350023e5c3f34e56' - '25861e760dc41b518cbee9c9194b2b19' - 'e4cd438a0b2a42dfb14bc7716e901e5f' - '5bfaf77580b6d3ce185b4c3ad4fa30ca' - '39d8b9249c5effe5fe24d2e9f80a9a94' - '2baf8cffccd50c568ad153a709cb3136' - 'e9b4ec9a34bdab1854255aaa05e7cedd' - '52e52f840a49eb1d14be1c0065b03a93' - '23520aca140fb0dd3e1b6f21b21f591f') diff --git a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch index 0524c8e5e..a44aef496 100644 --- a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch +++ b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch @@ -1,6 +1,6 @@ -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 +diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk +--- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200 ++++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200 @@ -1,10 +1,10 @@ INCLUDED_AUTOCONF_MK = 1 @@ -16,9 +16,9 @@ diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/basec 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 +diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk +--- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200 ++++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200 @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 diff --git a/libre-testing/iceweasel-libre/iceweasel.desktop b/libre-testing/iceweasel-libre/iceweasel.desktop index 740ed5b31..c4a338cc6 100644 --- a/libre-testing/iceweasel-libre/iceweasel.desktop +++ b/libre-testing/iceweasel-libre/iceweasel.desktop @@ -1,116 +1,105 @@ [Desktop Entry] +Encoding=UTF-8 Name=Iceweasel -GenericName=Web Browser -GenericName[af]=Web Blaaier -GenericName[ar]=متصفح ويب -GenericName[az]=Veb Səyyahı -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[br]=Furcher ar Gwiad -GenericName[bs]=WWW Preglednik -GenericName[ca]=Fullejador web -GenericName[cs]=WWW prohlížeč -GenericName[cy]=Porydd Gwe -GenericName[da]=Browser -GenericName[de]=Web-Browser -GenericName[el]=Περιηγητής Ιστού -GenericName[eo]=TTT-legilo -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fa]=مرورگر وب -GenericName[fi]=WWW-selain -GenericName[fo]=Alnótsfar -GenericName[fr]=Navigateur web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[is]=Vafri -GenericName[it]=Browser Web -GenericName[ja]=ウェブブラウザ -GenericName[ko]=웹 브라우저 -GenericName[lo]=ເວັບບຣາວເຊີ -GenericName[lt]=Žiniatinklio naršyklė -GenericName[lv]=Web Pārlūks -GenericName[mk]=Прелистувач на Интернет -GenericName[mn]=Веб-Хөтөч -GenericName[nb]=Nettleser -GenericName[nds]=Nettkieker -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[nso]=Seinyakisi sa Web -GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator de web -GenericName[ru]=Веб-браузер -GenericName[se]=Fierpmádatlogan -GenericName[sk]=Webový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sr]=Веб претраживач -GenericName[sr@Latn]=Veb pretraživač -GenericName[ss]=Ibrawuza yeWeb -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[tg]=Тафсиргари вэб -GenericName[th]=เว็บบราวเซอร์ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[uz]=Веб-браузер -GenericName[ven]=Buronza ya Webu -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[xh]=Umkhangeli zincwadi we Web -GenericName[zh_CN]=网页浏览器 -GenericName[zh_TW]=網頁瀏覽器 -GenericName[zu]=Umcingi we-Web +Name[bg]=Iceweasel +Name[ca]=Iceweasel +Name[cs]=Iceweasel +Name[el]=Iceweasel +Name[es]=Iceweasel +Name[fa]=Iceweasel +Name[fi]=Iceweasel +Name[fr]=Iceweasel +Name[hu]=Iceweasel +Name[it]=Iceweasel +Name[ja]=Iceweasel +Name[ko]=Iceweasel +Name[nb]=Iceweasel +Name[nl]=Iceweasel +Name[nn]=Iceweasel +Name[no]=Iceweasel +Name[pl]=Iceweasel +Name[pt]=Iceweasel +Name[pt_BR]=Iceweasel +Name[ru]=Iceweasel +Name[sk]=Iceweasel +Name[sv]=Iceweasel Comment=Browse the World Wide Web -Comment[ar]=تصفح الشبكة العنكبوتية العالمية -Comment[ast]=Restola pela Rede -Comment[bn]=ইন্টারনেট ব্রাউজ করুন -Comment[ca]=Navegueu per la web +Comment[bg]=Сърфиране в Мрежата +Comment[ca]=Navegueu per el web Comment[cs]=Prohlížení stránek World Wide Webu -Comment[da]=Surf på internettet Comment[de]=Im Internet surfen -Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό 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[fr]=Navigue sur Internet 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[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[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]=瀏覽網際網路 +GenericName=Web Browser +GenericName[bg]=Интернет браузър +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[de]=Webbrowser +GenericName[el]=Περιηγητής ιστού +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ru]=Интернет-браузер +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +X-GNOME-FullName=Iceweasel Web Browser +X-GNOME-FullName[bg]=Интернет браузър (Iceweasel) +X-GNOME-FullName[ca]=Navegador web Iceweasel +X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč +X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel +X-GNOME-FullName[es]=Navegador web Iceweasel +X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel +X-GNOME-FullName[fi]=Iceweasel-selain +X-GNOME-FullName[fr]=Navigateur Web Iceweasel +X-GNOME-FullName[hu]=Iceweasel webböngésző +X-GNOME-FullName[it]=Iceweasel Browser Web +X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ +X-GNOME-FullName[ko]=Iceweasel 웹 브라우저 +X-GNOME-FullName[nb]=Iceweasel Nettleser +X-GNOME-FullName[nl]=Iceweasel webbrowser +X-GNOME-FullName[nn]=Iceweasel Nettlesar +X-GNOME-FullName[no]=Iceweasel Nettleser +X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel +X-GNOME-FullName[pt]=Iceweasel Navegador Web +X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel +X-GNOME-FullName[ru]=Интернет-браузер Iceweasel +X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel +X-GNOME-FullName[sv]=Webbläsaren Iceweasel Exec=/usr/lib/iceweasel/iceweasel %u -Icon=iceweasel Terminal=false +X-MultipleArgs=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 +Icon=iceweasel Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; +StartupWMClass=Iceweasel +StartupNotify=true diff --git a/libre-testing/iceweasel-libre/iceweasel.install b/libre-testing/iceweasel-libre/iceweasel.install new file mode 100644 index 000000000..c1fe8284a --- /dev/null +++ b/libre-testing/iceweasel-libre/iceweasel.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-testing/iceweasel-libre/libre.patch b/libre-testing/iceweasel-libre/libre.patch index f80295e55..9d2aa7c05 100644 --- a/libre-testing/iceweasel-libre/libre.patch +++ b/libre-testing/iceweasel-libre/libre.patch @@ -1,19 +1,20 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-01-10 20:20:02.000000000 -0500 -+++ mozilla-release/browser/app/profile/firefox.js 2013-01-10 17:47:34.000000000 -0500 -@@ -1168,11 +1168,9 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-03-26 19:17:35.000000000 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-04-03 16:10:57.681396937 -0300 +@@ -1176,12 +1176,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); --// Example social provider +-// Default social providers -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); +- // Comma-separated list of nsIURI::prePaths that are allowed to activate // built-in social functionality. -pref("social.activation.whitelist", "https://www.facebook.com"); +pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.active", false); 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 @@ -156,9 +157,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 -@@ -3,25 +3,18 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 +@@ -3,19 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -180,16 +181,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio +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 -@@ -30,20 +23,10 @@ +@@ -24,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 @@ -206,14 +200,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # 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/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # 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/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net 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 diff --git a/libre-testing/iceweasel-libre/mozconfig b/libre-testing/iceweasel-libre/mozconfig index 121d31aea..c929b8972 100644 --- a/libre-testing/iceweasel-libre/mozconfig +++ b/libre-testing/iceweasel-libre/mozconfig @@ -1,39 +1,39 @@ . $topsrcdir/browser/config/mozconfig +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# Iceweasel +ac_add_options --disable-official-branding +ac_add_options --with-branding=debian/branding + # System libraries -#ac_add_options --enable-system-cairo -ac_add_options --enable-system-ffi -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-pixman -ac_add_options --enable-system-sqlite -ac_add_options --with-pthreads -ac_add_options --with-system-bz2 -ac_add_options --with-system-jpeg -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --with-system-png +ac_add_options --with-system-jpeg ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads # Features -ac_add_options --disable-crashreporter -ac_add_options --disable-installer -ac_add_options --disable-safe-browsing -ac_add_options --disable-tests -ac_add_options --disable-updater -#ac_add_options --enable-gstreamer ac_add_options --enable-startup-notification +#ac_add_options --enable-gstreamer -# Vendor settings -ac_add_options --libdir=/usr/lib -ac_add_options --prefix=/usr +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer -# Application settings -ac_add_options --disable-official-branding -ac_add_options --with-branding=debian/branding +# Parabola features +ac_add_options --disable-safe-browsing # Other mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir - -# Build-generated diff --git a/libre-testing/iceweasel-libre/mozconfig.pgo b/libre-testing/iceweasel-libre/mozconfig.pgo index 57d11eed0..2f4ebe32b 100644 --- a/libre-testing/iceweasel-libre/mozconfig.pgo +++ b/libre-testing/iceweasel-libre/mozconfig.pgo @@ -1,2 +1,3 @@ + # PGO mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' |