diff options
Diffstat (limited to 'libraries/pangox-compat')
4 files changed, 69 insertions, 12 deletions
diff --git a/libraries/pangox-compat/pangox-compat.SlackBuild b/libraries/pangox-compat/pangox-compat.SlackBuild index f4a0e6928d..051b55203a 100644 --- a/libraries/pangox-compat/pangox-compat.SlackBuild +++ b/libraries/pangox-compat/pangox-compat.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pangox-compat -VERSION=${VERSION:-0.0.2} +VERSION=${VERSION:-20150430_edb9e09} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; *) export ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=${PKG:-${TMP}/package-$PRGNAM} OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -62,14 +62,17 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION - chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Apply upstream patches +for i in $CWD/patches/*.patch ; do patch -p1 < $i ; done +NOCONFIGURE=1 ./autogen.sh CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/pangox-compat/pangox-compat.info b/libraries/pangox-compat/pangox-compat.info index 125100e1be..90866e9172 100644 --- a/libraries/pangox-compat/pangox-compat.info +++ b/libraries/pangox-compat/pangox-compat.info @@ -1,8 +1,8 @@ PRGNAM="pangox-compat" -VERSION="0.0.2" +VERSION="20150430_edb9e09" HOMEPAGE="https://www.pango.org" -DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/pangox-compat/0.0/pangox-compat-0.0.2.tar.xz" -MD5SUM="7bcbd0187f03e1e27af9a81e07249c33" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/pangox-compat-20150430_edb9e09.tar.xz" +MD5SUM="124c8c6c386df2006d20784b50073fbc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch b/libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch new file mode 100644 index 0000000000..de85c1719d --- /dev/null +++ b/libraries/pangox-compat/patches/0001-Re-add-pango_x_get_shaper_map-it-is-still-used-in-th.patch @@ -0,0 +1,39 @@ +From bd0fcfbd2f8f493e96955c1edd8a791de1e6568a Mon Sep 17 00:00:00 2001 +From: Jan de Groot <jgc@archlinux.org> +Date: Sun, 19 Feb 2017 07:57:57 +0000 +Subject: [PATCH] Re-add pango_x_get_shaper_map, it is still used in the + fallback code + +--- + pangox.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/pangox.c b/pangox.c +index 0a66cc9..1e6efc6 100644 +--- a/pangox.c ++++ b/pangox.c +@@ -1344,6 +1344,21 @@ pango_x_font_describe (PangoFont *font) + return NULL; + } + ++PangoMap * ++pango_x_get_shaper_map (PangoLanguage *language) ++{ ++ static guint engine_type_id = 0; ++ static guint render_type_id = 0; ++ ++ if (engine_type_id == 0) ++ { ++ engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_SHAPE); ++ render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_X); ++ } ++ ++ return pango_find_map (language, engine_type_id, render_type_id); ++} ++ + static PangoCoverage * + pango_x_font_get_coverage (PangoFont *font, + PangoLanguage *language) +-- +2.11.1 + diff --git a/libraries/pangox-compat/patches/0002-disable-shaper.patch b/libraries/pangox-compat/patches/0002-disable-shaper.patch new file mode 100644 index 0000000000..87f4598e39 --- /dev/null +++ b/libraries/pangox-compat/patches/0002-disable-shaper.patch @@ -0,0 +1,15 @@ +--- pangox-compat/pangox.c.orig 2020-05-04 18:31:53.421197064 -0400 ++++ pangox-compat/pangox.c 2020-05-04 18:32:41.251146923 -0400 +@@ -277,11 +277,11 @@ pango_x_font_class_init (PangoXFontClass + object_class->finalize = pango_x_font_finalize; + object_class->dispose = pango_x_font_dispose; + + font_class->describe = pango_x_font_describe; + font_class->get_coverage = pango_x_font_get_coverage; +- font_class->find_shaper = pango_x_font_find_shaper; ++ /* font_class->find_shaper = pango_x_font_find_shaper; */ + font_class->get_glyph_extents = pango_x_font_get_glyph_extents; + font_class->get_metrics = pango_x_font_get_metrics; + font_class->get_font_map = pango_x_font_get_font_map; + } + |