Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e953b1e936871f56fc181d234621cb64f952a17
commit 0e953b1e936871f56fc181d234621cb64f952a17 Author: Marius Cirsta <[email protected]> Date: Sat Nov 21 21:54:38 2015 +0200 no longer needed, bye diff --git a/source/xlib-extra/rapicorn/FrugalBuild b/source/xlib-extra/rapicorn/FrugalBuild deleted file mode 100644 index 44e9cb3..0000000 --- a/source/xlib-extra/rapicorn/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 0.13 SBU -# Maintainer: Marius Cirsta <[email protected]> - -pkgname=rapicorn -pkgver=14.10.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' 'gdk-pixbuf2') -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=('2a6e4eeff0f7f59fa57fbec12afd5ce0a627b707' \ - '0dbb6b013b075c279613521c5a96c1c725bb618d' \ - '9e883e4b28226b462930dc5c0e04b2f2fc30fa7f' \ - '6b73b532318ecd727fbfb907cef8e2f6ac6f2a8a') - - - -build() { - Fcd - cp ../acrapicorn.m4 . - cp ../ld-symbolic.m4 . - Fpatchall - Fautoreconf - Fmake - Fmakeinstall -} - -# optimization OK diff --git a/source/xlib-extra/rapicorn/acrapicorn.m4 b/source/xlib-extra/rapicorn/acrapicorn.m4 deleted file mode 100644 index e65d0a1..0000000 --- a/source/xlib-extra/rapicorn/acrapicorn.m4 +++ /dev/null @@ -1,237 +0,0 @@ -dnl # Rapicorn - -## 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 - *"m4_bpatsubst([$2], ["], [\\"])"*[)] - [$3] - ;; - *[)] - [$4] - ;; - esac -]) - -dnl # MC_EVAR_ADD(environment-variable, find-or-add-string) -AC_DEFUN([MC_EVAR_ADD], [ - MC_STR_CONTAINS($[$1], [$2], :, [$1]="$[$1] [$2]") -]) -dnl # MC_EVAR_SUPPLEMENT(environment-variable, check-string, add-string) -AC_DEFUN([MC_EVAR_SUPPLEMENT], [ - MC_STR_CONTAINS($[$1], [$2], [$1]="$[$1] [$3]", :) -]) - - -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_CC_TRY_OPTION(ENVVARIABLE, OPTION) -dnl # Check whether CC accepts OPTION and add to ENVVARIABLE -AC_DEFUN([MC_CC_TRY_OPTION], [ -AC_MSG_CHECKING([if ${CC-cc} supports [$2]]) -echo >conftest.c; -if ${CC-cc} $CFLAGS [$2] -c conftest.c >/dev/null 2>&1 ; then - AC_MSG_RESULT(yes) - MC_STR_CONTAINS($[$1], [$2], :, [$1]="$[$1] [$2]") -else - AC_MSG_RESULT(no) -fi -rm -fr conftest* -])dnl -dnl # MC_CXX_TRY_OPTION(ENVVARIABLE, OPTION) -dnl # Check whether CXX accepts OPTION and add to ENVVARIABLE -AC_DEFUN([MC_CXX_TRY_OPTION], [ -AC_MSG_CHECKING([if ${CXX-c++} supports [$2]]) -echo >conftest.c; -if ${CXX-c++} $CXXFLAGS [$2] -c conftest.c >/dev/null 2>&1 ; then - AC_MSG_RESULT(yes) - MC_STR_CONTAINS($[$1], [$2], :, [$1]="$[$1] [$2]") -else - AC_MSG_RESULT(no) -fi -rm -fr conftest* -])dnl diff --git a/source/xlib-extra/rapicorn/fix_build.patch b/source/xlib-extra/rapicorn/fix_build.patch deleted file mode 100644 index a944405..0000000 --- a/source/xlib-extra/rapicorn/fix_build.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- rapicorn-13.07.0/configure.ac 2013-07-06 01:01:01.000000000 +0300 -+++ rapicorn-13.07.0.new/configure.ac 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 deleted file mode 100644 index 16d64f9..0000000 --- a/source/xlib-extra/rapicorn/ld-symbolic.m4 +++ /dev/null @@ -1,45 +0,0 @@ -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 [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
