[SCM] sooperlooper/master: Dropped 05-C++11.patch (handled by libsigc++-dev)
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Thu Oct 22 08:01:58 UTC 2015
The following commit has been merged in the master branch:
commit 50a583e33e52a47dd54f676292fbe964c5f492ce
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date: Thu Oct 22 09:51:57 2015 +0200
Dropped 05-C++11.patch (handled by libsigc++-dev)
libsigc++-dev now includes the the '-std=c++11' flag in their pkg-config CFLAGS
diff --git a/debian/patches/05-C++11.patch b/debian/patches/05-C++11.patch
deleted file mode 100644
index cf7f8e8..0000000
--- a/debian/patches/05-C++11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: enable C++-11 support
- the code uses C++-11 features, so we have to pass "-std=c++11"
- unfortunately the submodules ignore any CXXFLAGS we pass them,
- so we need to patch the configure process
-Author: IOhannes m zmölnig
-Last-Update: 2015-10-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- sooperlooper.orig/configure.ac
-+++ sooperlooper/configure.ac
-@@ -357,7 +357,7 @@
- )
-
- AM_BUILD_ENVIRONMENT
--
-+ CXXFLAGS="-std=c++11 $CXXFLAGS"
-
- AC_SUBST(BASE_LIBS)
- AC_SUBST(BASE_INCLUDES)
---- sooperlooper.orig/libs/midi++/configure.ac
-+++ sooperlooper/libs/midi++/configure.ac
-@@ -239,7 +239,7 @@
-
- AM_BUILD_ENVIRONMENT
-
--CXXFLAGS="$CXXFLAGS $GUI_INCLUDES $SIGCPP_CFLAGS"
-+CXXFLAGS="-std=c++11 $CXXFLAGS $GUI_INCLUDES $SIGCPP_CFLAGS"
-
- AC_OUTPUT([Makefile
- version.cc
---- sooperlooper.orig/libs/pbd/configure.ac
-+++ sooperlooper/libs/pbd/configure.ac
-@@ -199,7 +199,7 @@
- AM_BUILD_ENVIRONMENT
-
- CFLAGS="$CFLAGS $XML_CFLAGS $SIGCPP_CFLAGS"
--CXXFLAGS="$CXXFLAGS $XML_CFLAGS $SIGCPP_CFLAGS"
-+CXXFLAGS="-std=c++11 $CXXFLAGS $XML_CFLAGS $SIGCPP_CFLAGS"
- LIBS="$LIBS $XML_LIBS $SIGCPP_LIBS"
-
- AC_OUTPUT([Makefile
diff --git a/debian/patches/06-sigc++-2.5.2.patch b/debian/patches/05-sigc++-2.5.2.patch
similarity index 100%
rename from debian/patches/06-sigc++-2.5.2.patch
rename to debian/patches/05-sigc++-2.5.2.patch
diff --git a/debian/patches/series b/debian/patches/series
index e1e1281..88693c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
02-remove_dmalloc.patch
03-indirect_linking.patch
04-build_with_wx_30.patch
-05-C++11.patch
-06-sigc++-2.5.2.patch
+05-sigc++-2.5.2.patch
--
sooperlooper packaging
More information about the pkg-multimedia-commits
mailing list