Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8effbce2aa503e3dc1cb41c755175d658e0b89a6
commit 8effbce2aa503e3dc1cb41c755175d658e0b89a6 Author: Marius Cirsta <mcir...@frugalware.org> Date: Mon Feb 17 02:44:14 2014 +0200 rapicorn-13.07.0-1-x86_64 * new package diff --git a/source/xlib-extra/rapicorn/FrugalBuild b/source/xlib-extra/rapicorn/FrugalBuild new file mode 100644 index 0000000..ff9add8 --- /dev/null +++ b/source/xlib-extra/rapicorn/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.13 SBU +# Maintainer: Marius Cirsta <mcir...@frugalware.org> + +pkgname=rapicorn +pkgver=13.07.0 +pkgrel=1 +pkgdesc="Rapicorn is a graphical user interface toolkit for rapid development of user interfaces for C++ and Python development." +url="http://rapicorn.org/"; +depends=('libpng' 'python' 'pango') +makedepends=('intltool' 'autoconf-archive') +groups=('xlib-extra') +archs=('i686' 'x86_64') +up2date="Flasttar https://testbit.eu/pub/dists/rapicorn/"; +source=(https://testbit.eu/pub/dists/rapicorn/$pkgname-$pkgver.tar.bz2 + acrapicorn.m4 ld-symbolic.m4 fix_build.patch) +sha1sums=('da1ab1f88468f37f8a82889a56ec6591f3f0537e' \ + '1e75cc6df1b2ccb9f72b85edce5bd0a1f7626692' \ + '9e883e4b28226b462930dc5c0e04b2f2fc30fa7f' \ + 'e04b1cab52ae048c57dff6fa0fa45ef08a828fdc') + + +build() { + Fcd + cp ../acrapicorn.m4 . + cp ../ld-symbolic.m4 . + Fpatchall + Fautoreconf + Fmake + Fmakeinstall +} diff --git a/source/xlib-extra/rapicorn/acrapicorn.m4 b/source/xlib-extra/rapicorn/acrapicorn.m4 new file mode 100644 index 0000000..79eec85 --- /dev/null +++ b/source/xlib-extra/rapicorn/acrapicorn.m4 @@ -0,0 +1,388 @@ +dnl # Rapicorn +dnl # GNU Lesser General Public License version 2 or any later version. + +## Portability defines that help interoperate with classic and modern autoconfs +ifdef([AC_TR_SH],[ +define([GLIB_TR_SH],[AC_TR_SH([$1])]) +define([GLIB_TR_CPP],[AC_TR_CPP([$1])]) +], [ +define([GLIB_TR_SH], + [patsubst(translit([[$1]], [*+], [pp]), [[^a-zA-Z0-9_]], [_])]) +define([GLIB_TR_CPP], + [patsubst(translit([[$1]], + [*abcdefghijklmnopqrstuvwxyz], + [PABCDEFGHIJKLMNOPQRSTUVWXYZ]), + [[^A-Z0-9_]], [_])]) +]) + +# AC_DIVERT_BEFORE_HELP(STUFF) +# --------------------------------- +# Put STUFF early enough so that they are available for $ac_help expansion. +# Handle both classic (<= v2.13) and modern autoconf +AC_DEFUN([AC_DIVERT_BEFORE_HELP], +[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], + [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl +$1 +AC_DIVERT_POP()])])]) + + +dnl # GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE]) +AC_DEFUN([GLIB_SIZEOF], +[pushdef([glib_Sizeof], GLIB_TR_SH([glib_cv_sizeof_$3]))dnl +AC_CACHE_CHECK([size of $2], glib_Sizeof, +[AC_TRY_RUN([#include <stdio.h> +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +$1 +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof($2)); + exit(0); +}], + [glib_Sizeof=`cat conftestval` dnl'' +], + [glib_Sizeof=0], + ifelse([$4], [], [], [glib_Sizeof=$4]))]) +AC_DEFINE_UNQUOTED(GLIB_TR_CPP(glib_sizeof_$3), [$[]glib_Sizeof], [Size of $3]) +popdef([glib_Sizeof])dnl +]) + + +dnl # MC_IF_VAR_EQ(environment-variable, value [, equals-action] [, else-action]) +AC_DEFUN([MC_IF_VAR_EQ], [ + case "$[$1]" in + "[$2]"[)] + [$3] + ;; + *[)] + [$4] + ;; + esac +]) + + +dnl # MC_STR_CONTAINS(src-string, sub-string [, contains-action] [, else-action]) +AC_DEFUN([MC_STR_CONTAINS], [ + case "[$1]" in + *"[$2]"*[)] + [$3] + ;; + *[)] + [$4] + ;; + esac +]) + +dnl # MC_EVAR_ADD(environment-variable, check-string, add-string) +AC_DEFUN([MC_EVAR_ADD], [ + MC_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]") +]) +dnl # MC_EVAR_SUPPLEMENT(environment-variable, check-string, add-string) +AC_DEFUN([MC_EVAR_SUPPLEMENT], [ + MC_STR_CONTAINS($[$1], [$2], [$1]="$[$1] [$3]", [$1]="$[$1]") +]) + + +dnl # MC_CHECK_VERSION() extracts up to 6 decimal numbers out of given-version +dnl and required-version, using any non-number letters as delimiters. it then +dnl compares each of those 6 numbers in order 1..6 to each other, requirering +dnl all of the 6 given-version numbers to be greater than, or at least equal +dnl to the corresponding number of required-version. +dnl MC_CHECK_VERSION(given-version, required-version [, match-action] [, else-action]) +AC_DEFUN([MC_CHECK_VERSION], [ +[eval `echo "$1:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \ + -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\(.*\)/ac_v1=\1 ac_v2=\2 ac_v3=\3 ac_v4=\4 ac_v5=\5 ac_v6=\6/' \ +`] +[eval `echo "$2:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \ + -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\(.*\)/ac_r1=\1 ac_r2=\2 ac_r3=\3 ac_r4=\4 ac_r5=\5 ac_r6=\6/' \ +`] +ac_vm=[`expr \( $ac_v1 \> $ac_r1 \) \| \( \( $ac_v1 \= $ac_r1 \) \& \( \ + \( $ac_v2 \> $ac_r2 \) \| \( \( $ac_v2 \= $ac_r2 \) \& \( \ + \( $ac_v3 \> $ac_r3 \) \| \( \( $ac_v3 \= $ac_r3 \) \& \( \ + \( $ac_v4 \> $ac_r4 \) \| \( \( $ac_v4 \= $ac_r4 \) \& \( \ + \( $ac_v5 \> $ac_r5 \) \| \( \( $ac_v5 \= $ac_r5 \) \& \( \ + \( $ac_v6 \>= $ac_r6 \) \ + \) \) \ + \) \) \ + \) \) \ + \) \) \ + \) \) `] +case $ac_vm in +[1)] + [$3] + ;; +*[)] + [$4] + ;; +esac +]) + +dnl # MC_DEFINE_SPINLOCK_INITIALIZER(includes) +AC_DEFUN([MC_DEFINE_SPINLOCK_INITIALIZER], +[AC_REQUIRE([AC_PROG_CC]) +AC_LANG_PUSH([C]) +LDFLAGS_SAVE="$LDFLAGS" ; LDFLAGS="-pthread $LDFLAGS" +AC_CACHE_CHECK(for Spinlock initializer, mc_cv_spinlock_initializer, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([ + #include <stdio.h> + #include <stddef.h> + #include <assert.h> + #include <pthread.h> + #include <inttypes.h> + $1], [[ + static char xmem[1024] = { 0, }; + pthread_spinlock_t *slock1 = (pthread_spinlock_t*) (((ptrdiff_t) xmem + (sizeof xmem)/2) & 0xffffffffffffff00); + int i; + for (i = 0; i < (sizeof (pthread_spinlock_t) + 3) / 4; i++) + assert (0 == ((int*) slock1)[i]); + int ret = pthread_spin_init (slock1, 0); + assert (ret == 0); + char ymem[1024] = { 0, }; + pthread_spinlock_t *slock2 = (pthread_spinlock_t*) (((ptrdiff_t) ymem + (sizeof ymem)/2) & 0xffffffffffffff00); + ret = pthread_spin_init (slock2, 0); + assert (ret == 0); + assert (*slock1 == *slock2); + FILE *f = fopen ("conftest_spinlock_initializer", "w"); + assert (f); + fprintf (f, "{ "); + for (i = 0; i < (sizeof (pthread_spinlock_t) + 3) / 4; i++) + fprintf (f, "%s0x%04x", i ? ", " : "", ((int*) slock2)[i]); + fprintf (f, " }\n"); + assert (sizeof (pthread_spinlock_t) == 4); // implementation assumption + fclose (f); + return 0; +]])], + [mc_cv_spinlock_initializer=`cat conftest_spinlock_initializer`; rm -f conftest_spinlock_initializer], + AC_MSG_FAILURE([spinlock check failed to execute]))]) +LDFLAGS="$LDFLAGS_SAVE" +AC_LANG_POP([C]) +]) + +dnl # MC_ASSERT_NONEMPTY(variable, program, srcpackage) +AC_DEFUN([MC_ASSERT_NONEMPTY], [ + case "x$[$1]"y in + xy) + AC_MSG_ERROR([failed to find $2 which is required for a functional build. $3]) + ;; + esac +]) + +dnl # MC_ASSERT_PROG(variable, program, srcpackage) - Find program +AC_DEFUN([MC_ASSERT_PROG], [ + AC_PATH_PROG([$1], [$2], missing!) + case "_$[$1]" in + '_missing!') + AC_MSG_ERROR([failed to find $2 which is required for a functional build. $3]) + ;; + esac +]) +dnl # MC_ASSERT_PROGS(variable, programs, srcpackage) +AC_DEFUN([MC_ASSERT_PROGS], [ + AC_PATH_PROGS([$1], [$2], missing!) + case "_$[$1]" in + '_missing!') + AC_MSG_ERROR([failed to find any of ($2) which is required for a functional build. $3]) + ;; + esac +]) + +dnl # MC_PKG_CONFIG_REQUIRE(package, version, clfgas-var, libs-var) +dnl # Find package through $PKG_CONFIG +AC_DEFUN([MC_PKG_CONFIG_REQUIRE], [ + mc_PACKAGE="[$1]" + mc_VERSION="[$2]" + AC_MSG_CHECKING([for $mc_PACKAGE - version >= $mc_VERSION]) + if $PKG_CONFIG --atleast-version="$mc_VERSION" $mc_PACKAGE 2>/dev/null ; then + mc_VERSION=`$PKG_CONFIG --modversion $mc_PACKAGE` + AC_MSG_RESULT([yes ($mc_VERSION)]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([pkg-config failed to find "$mc_PACKAGE" v"$mc_VERSION"]) + fi + [$3]=`$PKG_CONFIG $mc_PACKAGE --cflags` + [$4]=`$PKG_CONFIG $mc_PACKAGE --libs` + unset mc_PACKAGE + unset mc_VERSION +]) + +dnl # MC_PROG_CC_SUPPORTS_OPTION(OPTIONS, ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]) +dnl # Check whether cc accepts a certain option +AC_DEFUN([MC_PROG_CC_SUPPORTS_OPTION], [ +AC_MSG_CHECKING([whether ${CC-cc} supports $1]) +echo >conftest.c; +if ${CC-cc} [$1] -c $CFLAGS conftest.c >/dev/null 2>&1 ; then + AC_MSG_RESULT(yes) + [$2] +else + AC_MSG_RESULT(no) + [$3] +fi +rm -fr conftest* +])dnl + +dnl # MC_PROG_CC_WITH_CFLAGS() +dnl # Setup CC with default CFLAGS value. +AC_DEFUN([MC_PROG_CC_WITH_CFLAGS], [ + MC_IF_VAR_EQ(CFLAGS, "", CFLAGS="-g") + CFLAGS_saved="$CFLAGS" + unset CFLAGS + dnl Checks for compiler characteristics, CFLAGS. + AC_PROG_CC + MC_STR_CONTAINS($CFLAGS, -g, CFLAGS_include_g=yes) + MC_STR_CONTAINS($CFLAGS, -O, CFLAGS_include_O=yes) + CFLAGS="$CFLAGS_saved" + + dnl Setup CFLAGS for debugging. + MC_IF_VAR_EQ(enable_debug, yes, + MC_IF_VAR_EQ(CFLAGS_include_g, yes, + MC_EVAR_ADD(CFLAGS, -g, -g) + ) + dnl Reading assembler Code + MC_IF_VAR_EQ(GCC, yes, + dnl MC_EVAR_ADD(CFLAGS, -fvolatile-global, -fvolatile-global) + dnl MC_EVAR_ADD(CFLAGS, -fverbose-asm, -fverbose-asm) + ) + ) + + dnl Further setup CFLAGS for GCC. + MC_IF_VAR_EQ(GCC, yes, + dnl # Sane Behaviour + MC_EVAR_ADD(CFLAGS, -fno-cond-mismatch, -fno-cond-mismatch) + MC_PROG_CC_SUPPORTS_OPTION(-mcx16, MC_EVAR_ADD(CFLAGS, -mcx16, -mcx16)) + MC_PROG_CC_SUPPORTS_OPTION(-rdynamic, MC_EVAR_ADD(CFLAGS, -rdynamic, -rdynamic)) + + dnl # Debugging + MC_EVAR_SUPPLEMENT(CFLAGS, -g, -ggdb3) + + dnl # Warnings. + MC_EVAR_ADD(CFLAGS, -Wall, -Wall) + MC_EVAR_ADD(CFLAGS, -Wmissing-prototypes, -Wmissing-prototypes) + MC_EVAR_ADD(CFLAGS, -Wmissing-declarations, -Wmissing-declarations) + MC_EVAR_ADD(CFLAGS, -Wno-cast-qual, -Wno-cast-qual) + dnl MC_EVAR_ADD(CFLAGS, -Winline, -Winline) + MC_IF_VAR_EQ(enable_pedantic_ansi, yes, + MC_EVAR_ADD(CFLAGS, -ansi, -ansi) + MC_EVAR_ADD(CFLAGS, -pedantic, -pedantic) + ) + dnl # avoid lots of bogus warnings with string pointers + MC_PROG_CC_SUPPORTS_OPTION(-Wno-pointer-sign, + MC_EVAR_ADD(CFLAGS, -Wno-pointer-sign, -Wno-pointer-sign)) + dnl problematic, triggers warnings in glibc headers + MC_EVAR_ADD(CFLAGS, -Wpointer-arith, -Wpointer-arith) + dnl problematic, warns on prototype arguments: + dnl MC_EVAR_ADD(CFLAGS, -Wshadow, -Wshadow) + dnl problematic, glibc breakage: + MC_EVAR_ADD(CFLAGS, -Wredundant-decls, -Wredundant-decls) + dnl instrument function workarounds + MC_STR_CONTAINS($CC $CFLAGS, -finstrument-functions, + [mc_opt_warn_no_return=-Wno-missing-noreturn], + [mc_opt_warn_no_return=-Wmissing-noreturn]) + MC_PROG_CC_SUPPORTS_OPTION($mc_opt_warn_no_return, + MC_EVAR_ADD(CFLAGS, $mc_opt_warn_no_return, $mc_opt_warn_no_return)) + + dnl # Optimizations + MC_EVAR_ADD(CFLAGS, -pipe, -pipe) + MC_EVAR_ADD(CFLAGS, -O, -O2) + MC_PROG_CC_SUPPORTS_OPTION(-ftracer, + MC_EVAR_ADD(CFLAGS, -ftracer, -ftracer)) + MC_EVAR_ADD(CFLAGS, -finline-functions, -finline-functions) dnl -O3 stuff as of gcc-3.3 + MC_PROG_CC_SUPPORTS_OPTION(-fno-keep-static-consts, + MC_EVAR_ADD(CFLAGS, -fno-keep-static-consts, -fno-keep-static-consts)) + dnl MC_EVAR_ADD(CFLAGS, -freg-struct-return, -freg-struct-return) dnl buggy with gcc-3.2 + + dnl # Fun options + dnl MC_EVAR_ADD(CFLAGS, -Q, -Q) dnl report each compiled function + dnl MC_EVAR_ADD(CFLAGS, -ftime-report, -ftime-report) + dnl MC_EVAR_ADD(CFLAGS, -fmem-report, -fmem-report) + , + MC_IF_VAR_EQ(CFLAGS_include_O, yes, + MC_EVAR_ADD(CFLAGS, -O, -O2) + ) + ) +]) + +dnl # MC_PROG_CC_SPECIAL_FLAGS([VARNAME], [FLAG_LIST]) +AC_DEFUN([MC_PROG_CC_SPECIAL_FLAGS], [ + for flag in [$2] ; do + MC_PROG_CC_SUPPORTS_OPTION($flag, MC_EVAR_ADD([$1], $flag, $flag)) + done + AC_MSG_CHECKING([[$1]]) + AC_MSG_RESULT($[$1]) +]) + +dnl # MC_PROG_CXX_WITH_CXXFLAGS() +dnl # Setup CXX with default CXXFLAGS value. +AC_DEFUN([MC_PROG_CXX_WITH_CXXFLAGS], [ + MC_IF_VAR_EQ(CXXFLAGS, "", CXXFLAGS="-g") + CXXFLAGS_saved="$CXXFLAGS" + unset CXXFLAGS + dnl Checks for compiler characteristics, CXXFLAGS. + AC_PROG_CXX + MC_STR_CONTAINS($CXXFLAGS, -g, CXXFLAGS_include_g=yes) + MC_STR_CONTAINS($CXXFLAGS, -O, CXXFLAGS_include_O=yes) + CXXFLAGS="$CXXFLAGS_saved" + + dnl # Setup CXXFLAGS for debugging. + MC_IF_VAR_EQ(enable_debug, yes, + MC_IF_VAR_EQ(CXXFLAGS_include_g, yes, + MC_EVAR_ADD(CXXFLAGS, -g, -g) + ) + dnl Reading assembler Code + MC_IF_VAR_EQ(GCC, yes, + dnl MC_EVAR_ADD(CXXFLAGS, -fvolatile-global, -fvolatile-global) + dnl MC_EVAR_ADD(CXXFLAGS, -fverbose-asm, -fverbose-asm) + ) + ) + + dnl # Further setup CXXFLAGS for GXX. + MC_IF_VAR_EQ(GXX, yes, + dnl # Sane Behaviour + MC_PROG_CC_SUPPORTS_OPTION(-mcx16, MC_EVAR_ADD(CXXFLAGS, -mcx16, -mcx16)) + MC_PROG_CC_SUPPORTS_OPTION(-rdynamic, MC_EVAR_ADD(CXXFLAGS, -rdynamic, -rdynamic)) + + dnl # enable many useful warnings + MC_EVAR_ADD(CXXFLAGS, -Wall, -Wall) + MC_EVAR_ADD(CXXFLAGS, -Wdeprecated, -Wdeprecated) + MC_EVAR_ADD(CXXFLAGS, -Wno-cast-qual, -Wno-cast-qual) + dnl # MC_EVAR_ADD(CXXFLAGS, -Wmissing-prototypes, -Wmissing-prototypes) + dnl # MC_EVAR_ADD(CXXFLAGS, -Winline, -Winline) + + dnl # avoid bogus offsetof()-usage warnings + dnl MC_PROG_CC_SUPPORTS_OPTION(-Wno-invalid-offsetof, + dnl MC_EVAR_ADD(CXXFLAGS, -Wno-invalid-offsetof, -Wno-invalid-offsetof)) + + dnl Optimizations + MC_EVAR_ADD(CXXFLAGS, -pipe, -pipe) + MC_EVAR_ADD(CXXFLAGS, -O, -O2) + MC_PROG_CC_SUPPORTS_OPTION(-ftracer, + MC_EVAR_ADD(CXXFLAGS, -ftracer, -ftracer)) + MC_EVAR_ADD(CXXFLAGS, -finline-functions, -finline-functions) dnl -O3 stuff as of gcc-3.3 + MC_PROG_CC_SUPPORTS_OPTION(-fno-keep-static-consts, + MC_EVAR_ADD(CXXFLAGS, -fno-keep-static-consts, -fno-keep-static-consts)) + dnl MC_EVAR_ADD(CXXFLAGS, -freg-struct-return, -freg-struct-return) dnl buggy with gcc-3.2 + dnl -funroll-loops gives problems with -O and templates (see Rep-CppBug_1.C) + + dnl figure current screen width from ncurses to make g++ + dnl format errors for screensizes!=80 correctly + gxx_columns=0 + AC_CHECK_PROG(TPUT, tput, yes) + if test "$TPUT" = "yes"; then + gxx_columns=`tput cols` + fi + if test "$gxx_columns" -gt 1 ; then + MC_PROG_CC_SUPPORTS_OPTION(-fmessage-length=$gxx_columns, + MC_EVAR_ADD(CXXFLAGS, -fmessage-length=, -fmessage-length=$gxx_columns)) + fi + dnl + + , + MC_IF_VAR_EQ(CXXFLAGS_include_O, yes, + MC_EVAR_ADD(CXXFLAGS, -O, -O2) + ) + ) +]) diff --git a/source/xlib-extra/rapicorn/fix_build.patch b/source/xlib-extra/rapicorn/fix_build.patch new file mode 100644 index 0000000..2cf310f --- /dev/null +++ b/source/xlib-extra/rapicorn/fix_build.patch @@ -0,0 +1,53 @@ +--- rapicorn-13.07.0/configure.in 2013-07-06 01:01:01.000000000 +0300 ++++ rapicorn-13.07.0.new/configure.in 2014-02-17 02:10:17.000000000 +0200 +@@ -17,7 +17,7 @@ + echo -n $RAPICORN_VERSION${RAPICORN_RELEASE_CANDIDATE:+-}${RAPICORN_RELEASE_CANDIDATE} + ])) # defines PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_STRING + AC_CONFIG_SRCDIR([ui/widget.hh]) +-AM_CONFIG_HEADER(configure.h) ++AC_CONFIG_HEADERS(configure.h) + AC_PREREQ(2.57) + # extract above versions + [RAPICORN_RELEASE_YEAR=`echo $PACKAGE_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(.*\)/\1/'`] +@@ -270,13 +270,17 @@ + dnl --- require libpng --- + if test -z "$LIBPNG"; then + dnl # png_set_add_alpha() exists only since libpng v1.2 +- AC_MSG_CHECKING(for libpng12) ++ AC_MSG_CHECKING(for libpng) + if $PKG_CONFIG --exists libpng12 ; then + AC_MSG_RESULT(yes) + LIBPNG=`$PKG_CONFIG --libs libpng12` + elif $PKG_CONFIG --exists libpng13 ; then + AC_MSG_RESULT(yes) + LIBPNG=`$PKG_CONFIG --libs libpng13` ++ elif $PKG_CONFIG --exists libpng14 ; then ++ AC_MSG_RESULT(yes) ++ AC_DEFINE_UNQUOTED(LIBPNG14, 1, "libpng 1.4") ++ LIBPNG=`$PKG_CONFIG --libs libpng14` + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([PNG image library libpng (>= 1.2) is missing, but required]) +--- rapicorn-13.07.0/ui/pixmap.cc 2013-07-06 01:01:01.000000000 +0300 ++++ rapicorn-13.07.0.new/ui/pixmap.cc 2014-02-17 02:12:58.000000000 +0200 +@@ -6,6 +6,8 @@ + #include <math.h> + #include <cstring> + ++#include "configure.h" ++ + #define MAXDIM (20480) // MAXDIM*MAXDIM < 536870912 + #define ALIGN_SIZE(size,pow2align) ((size + (pow2align - 1)) & -pow2align) + +@@ -450,7 +452,11 @@ + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_palette_to_rgb (png_ptr); // request RGB format + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) ++#ifdef LIBPNG14 ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); // request 8bit per sample ++#else + png_set_gray_1_2_4_to_8 (png_ptr); // request 8bit per sample ++#endif + if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png_ptr); // request transparency as alpha channel + if (bit_depth == 16) diff --git a/source/xlib-extra/rapicorn/ld-symbolic.m4 b/source/xlib-extra/rapicorn/ld-symbolic.m4 new file mode 100644 index 0000000..16d64f9 --- /dev/null +++ b/source/xlib-extra/rapicorn/ld-symbolic.m4 @@ -0,0 +1,45 @@ +dnl Copyright (C) 2007 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl Set SYMBOLIC_LDFLAGS to -Bsymbolic-functions for GNU linker if it +dnl is supported. +AC_DEFUN([ACX_PROG_LD_GNU_SYMBOLIC], +[AC_CACHE_CHECK([if the GNU linker ($LD) supports -Bsymbolic-functions], +acl_cv_prog_gnu_ld_symbolic, [ +acl_cv_prog_gnu_ld_symbolic=no +AC_REQUIRE([AC_LIB_PROG_LD_GNU]) +if test x"$with_gnu_ld" = x"yes"; then + if $LD --help 2>&1 </dev/null | grep Bsymbolic-functions 1>&5; then + acl_cv_prog_gnu_ld_symbolic=yes + fi +fi]) +if test x"$acl_cv_prog_gnu_ld_symbolic" = x"yes"; then + SYMBOLIC_LDFLAGS="-Wl,-Bsymbolic-functions" +else + SYMBOLIC_LDFLAGS='' +fi +]) + +dnl Set DYNAMIC_LIST_CPP_NEW_LDFLAGS to --dynamic-list-cpp-new for GNU +dnl linker if it is supported. +AC_DEFUN([ACX_PROG_LD_GNU_DYNAMIC_LIST_CPP_NEW], +[AC_CACHE_CHECK([if the GNU linker ($LD) supports --dynamic-list-cpp-new], +acl_cv_prog_gnu_ld_dynamic_list_cpp_new, [ +acl_cv_prog_gnu_ld_dynamic_list_cpp_new=no +AC_REQUIRE([ACX_PROG_LD_GNU_SYMBOLIC]) +if test x"$with_gnu_ld" = x"yes" -a \ + x"$acl_cv_prog_gnu_ld_symbolic" = x"yes"; then + if $LD --help 2>&1 </dev/null | grep dynamic-list-cpp-new 1>&5; then + acl_cv_prog_gnu_ld_dynamic_list_cpp_new=yes + fi +fi]) +if test x"$acl_cv_prog_gnu_ld_dynamic_list_cpp_new" = x"yes"; then + DYNAMIC_LIST_CPP_NEW_LDFLAGS="$SYMBOLIC_LDFLAGS -Wl,--dynamic-list-cpp-new" +else + DYNAMIC_LIST_CPP_NEW_LDFLAGS='' +fi +]) _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
