Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

5 files changed, 41 insertions, 20 deletions

diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD
index faa4b3a2a..ef7ea7641 100644
--- a/libre/mozilla-devscripts/PKGBUILD
+++ b/libre/mozilla-devscripts/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgname=mozilla-devscripts
-pkgver=0.30
-pkgrel=1.1
+pkgver=0.32
+pkgrel=1
 pkgdesc="Development scripts used by Debian Mozilla's addons packages"
 arch=("any")
 url="http://packages.debian.org/source/unstable/mozilla-devscripts"
@@ -11,8 +12,8 @@ depends=("python2" "zip" "unzip")
 _debrepo=http://ftp.debian.org/debian/pool/main/
 source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
         "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
-md5sums=("6e517cef69c115356eb808866fd29268"
-         "4e95fb93d0d93b56543d2a789d457309")
+md5sums=("386a5854601f29dca4a293f90f6c2a69"
+         "230126afa15fa654eb254bb4e61b4a93")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory
deleted file mode 100644
index 60ed4bded..000000000
--- a/libre/psutils-libre/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,11,16,24,1
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 68c71284c..3dd2a8620 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,19 +25,19 @@ source=('texmf.cnf'
         'poppler-0.20.patch'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
+        'luatex-r4449-radical-rule-thickness.patch'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
-  etc/texmf/chktex/chktexrc \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/web2c/updmap.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
+    etc/texmf/chktex/chktexrc \
+	etc/texmf/dvipdfm/config/config \
+	etc/texmf/dvipdfmx/dvipdfmx.cfg \
+	etc/texmf/dvips/config/config.ps \
 	etc/texmf/tex/generic/config/language.dat \
 	etc/texmf/tex/generic/config/language.def \
 	etc/texmf/tex/generic/config/pdftexconfig.tex \
 	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvipdfm/config/config \
+	etc/texmf/web2c/fmtutil.cnf \
+	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
 
 md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
@@ -45,7 +45,8 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
          '393a4bf67adc7ca5df2b386759d1a637'
          'e3a664d5a7f0923f35060fe9d25d2573'
          'ac2c3c3aa765581f8504e21a5edbfb9f'
-         'f315a860158cfc952c82a6d759961024')
+         'f315a860158cfc952c82a6d759961024'
+         '5190f3295eb9a604c5f17f5bd607299b')
 
 build() {
    if [ "${CARCH}" != "i686" ]; then
@@ -58,6 +59,9 @@ build() {
    patch -Np0 -i fix-fontforge-encoding.patch
    # fix build with poppler >= 0.20
    patch -Np0 -i poppler-0.20.patch
+   # fix radical rule thickness regression in Luatex
+   # http://tex.stackexchange.com/q/61952/729
+   patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
    # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
    sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
    #############################################################
diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
new file mode 100644
index 000000000..f925a1a93
--- /dev/null
+++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
@@ -0,0 +1,23 @@
+Index: source/texk/web2c/luatexdir/tex/mlist.w
+===================================================================
+--- source/texk/web2c/luatexdir/tex/mlist.w	(revision 4448)
++++ source/texk/web2c/luatexdir/tex/mlist.w	(revision 4449)
+@@ -1798,7 +1798,17 @@
+         theta = fraction_rule(cur_style);
+         y = var_delimiter(left_delimiter(q), cur_size,
+                           height(x) + depth(x) + clr + theta, NULL, cur_style);
+-        theta = height(y);
++	/* If |y| is a composite then set |theta| to the height of its top
++           character, else set it to the height of |y|. */
++        if (list_ptr(y) != null
++            && type(list_ptr(y)) == hlist_node
++            && list_ptr(list_ptr(y)) != null
++            && type(list_ptr(list_ptr(y))) == glyph_node) {     /* and it should be */
++            theta = char_height(font(list_ptr(list_ptr(y))),
++                           character(list_ptr(list_ptr(y))));
++        } else {
++            theta = height(y);
++        }
+     } else {
+         y = var_delimiter(left_delimiter(q), cur_size,
+                           height(x) + depth(x) + clr + theta, NULL, cur_style);
diff --git a/libre/texlive-core-libre/.directory b/libre/texlive-core-libre/.directory
deleted file mode 100644
index 9d572f361..000000000
--- a/libre/texlive-core-libre/.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Dolphin]
-Timestamp=2012,6,26,20,37,17
-
-[Settings]
-HiddenFilesShown=true