From ac0682d657d64a2004b1f7f8f23ffab19dca43a0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 19 Apr 2015 15:59:40 +0200 Subject: [PATCH] libsigc++: fix recipes. - 1.2 is not backwards compatible so keep it around, - Upgrade 2.2 to 2.4 which is easier to build. --- dev-libs/libsigc++/libsigc++-1.2.7.recipe | 75 ++++++++++++++----- dev-libs/libsigc++/libsigc++-2.2.7.recipe | 25 ------- dev-libs/libsigc++/libsigc++-2.4.1.recipe | 72 ++++++++++++++++++ .../patches/libsigc++-1.2.7.patchset | 35 +++++++++ 4 files changed, 164 insertions(+), 43 deletions(-) delete mode 100644 dev-libs/libsigc++/libsigc++-2.2.7.recipe create mode 100644 dev-libs/libsigc++/libsigc++-2.4.1.recipe create mode 100644 dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.recipe b/dev-libs/libsigc++/libsigc++-1.2.7.recipe index 246950f41..34d11ce2b 100644 --- a/dev-libs/libsigc++/libsigc++-1.2.7.recipe +++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe @@ -1,29 +1,68 @@ -DESCRIPTION="libsigc++ is a typesafe callback system for standard C++" +SUMMARY="Callback Framework for C++" +DESCRIPTION="A typesafe callback system for standard C++. It allows you to \ +define signals and to connect those signals to any callback function, either \ +global or a member function, regardless of whether it is static or virtual. + +It also contains adaptor classes for connection of dissimilar callbacks and \ +has an ease of use unmatched by other C++ callback libraries." + HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-1.2.7.tar.gz" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-cpp/mm-common >= 0.9.2" -CHECKSUM_MD5="b939751dff0db9652c5dbfc9de685efa" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-$portVersion.tar.gz" +CHECKSUM_SHA256="c995a4623d9f71455d8c7d62307a13e68e0f8313f47adb7221421455bbdfcb98" +PATCHES="libsigc++-$portVersion.patchset" + +REVISION="1" +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + libsigc++$secondaryArchSuffix = $portVersion + lib:libsigc_1.2$secondaryArchSuffix = 0.0.0 compat = 0 +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix +" + +PROVIDES_devel=" + libsigc++${secondaryArchSuffix}_devel = $portVersion + devel:libsigc_1.2$secondaryArchSuffix = 0.0.0 compat = 0 +" + +REQUIRES_devel=" + libsigc++$secondaryArchSuffix == $portVersion base +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +" + +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:libtoolize + cmd:make +" + BUILD() { - cd libsigc++-1.2.7 libtoolize --force --copy --install - aclocal -I scripts - autoconf - automake - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -i -# There's name make file for tests and examples directories so just ignore (-i) -# those errors and we really don't need either one + aclocal + sh autogen.sh + runConfigure --omit-dirs "docDir dataRootDir" ./configure + make $jobArgs } INSTALL() { - cd libsigc++-1.2.7 - make -i install + make install + + prepareInstalledDevelLib libsigc-1.2 + rm $developLibDir/*.la + fixPkgconfig + + packageEntries devel $relativeDevelopDir } LICENSE="GNU LGPL v2.1" -COPYRIGHT="2002, 2003, 2005 The libsigc++ Development Team" +COPYRIGHT="2002-2005 The libsigc++ Development Team" diff --git a/dev-libs/libsigc++/libsigc++-2.2.7.recipe b/dev-libs/libsigc++/libsigc++-2.2.7.recipe deleted file mode 100644 index 8ab2d197f..000000000 --- a/dev-libs/libsigc++/libsigc++-2.2.7.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libsigc++ is a typesafe callback system for standard C++" -HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-2.2.7.tar.gz" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="dev-cpp/mm-common >= 0.9.2" -CHECKSUM_MD5="48afe53ba0e3958f6ac5f072afed1c53" -BUILD() -{ - cd libsigc++-2.2.7 - libtoolize --force --copy - aclocal - sh autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libsigc++-2.2.7 - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2002, 2003, 2005 The libsigc++ Development Team" diff --git a/dev-libs/libsigc++/libsigc++-2.4.1.recipe b/dev-libs/libsigc++/libsigc++-2.4.1.recipe new file mode 100644 index 000000000..a129a986d --- /dev/null +++ b/dev-libs/libsigc++/libsigc++-2.4.1.recipe @@ -0,0 +1,72 @@ +SUMMARY="Callback Framework for C++" +DESCRIPTION="A typesafe callback system for standard C++. It allows you to \ +define signals and to connect those signals to any callback function, either \ +global or a member function, regardless of whether it is static or virtual. + +It also contains adaptor classes for connection of dissimilar callbacks and \ +has an ease of use unmatched by other C++ callback libraries." + +HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.4/libsigc++-$portVersion.tar.xz" +#CHECKSUM_SHA256="355f2a580ea105514a1589610305ab1e3e0980aea19c3b427027dc160f6be06c" +REVISION="1" +ARCHITECTURES="" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libsigc++$secondaryArchSuffix = $portVersion + lib:libsigc_2.0$secondaryArchSuffix = 0.0.0 compat = 0 +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix +" + +PROVIDES_devel=" + libsigc++${secondaryArchSuffix}_devel = $portVersion + devel:libsigc_2.0$secondaryArchSuffix = 0.0.0 compat = 0 +" + +REQUIRES_devel=" + libsigc++$secondaryArchSuffix == $portVersion base +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +" + +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:libtoolize + cmd:make +" + +BUILD() +{ +# libtoolize --force --copy --install +# aclocal +# sh autogen.sh + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libsigc-2.0 + rm $developLibDir/*.la + fixPkgconfig + + packageEntries devel $relativeDevelopDir +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2002-2015 The libsigc++ Development Team" diff --git a/dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset b/dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset new file mode 100644 index 000000000..e68f0e495 --- /dev/null +++ b/dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset @@ -0,0 +1,35 @@ +From 24b160684e82a2f3fe8c76e3f53e66aa7f8cd2cf Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 19 Apr 2015 15:58:32 +0200 +Subject: Modernize autotools scripts. + + +diff --git a/configure.in b/configure.in +index 0a0915f..36e3162 100644 +--- a/configure.in ++++ b/configure.in +@@ -49,7 +49,7 @@ dnl Initialize automake stuff + AM_INIT_AUTOMAKE($PACKAGE, $VERSION) + + dnl Specify a configuration file +-AM_CONFIG_HEADER(sigc++/config/sigcconfig.h) ++AC_CONFIG_HEADERS(sigc++/config/sigcconfig.h) + + AM_MAINTAINER_MODE + +diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am +index 9b13ca2..2c212b4 100644 +--- a/sigc++/Makefile.am ++++ b/sigc++/Makefile.am +@@ -12,7 +12,7 @@ sigc_built_cc = + sigc_built_h = bind_return.h \ + object_slot.h retype_return.h slot.h bind.h \ + class_slot.h hide.h retype.h signal.h \ +- method_slot.h method_slot.h ++ method_slot.h + + built_sources = $(sigc_built_cc) $(sigc_built_h) + dist_sources = $(sigc_fixed_cc) $(sigc_fixed_h) +-- +2.2.2 +