From e2d0b8223afb6dc99102e4ca1198332cf4fef8805ada9ce5cdee53ca46217676 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 May 2011 05:21:47 +0000 Subject: [PATCH] Accepting request 70624 from home:RedDwarf:branches:multimedia:libs - fix baselibs.conf - allow GTK deprectaed functions OBS-URL: https://build.opensuse.org/request/show/70624 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=21 --- _service:set_version:libquicktime.spec | 2 ++ baselibs.conf | 2 +- ...cktime-1.2.2-dont_disable_deprecated.patch | 27 +++++++++++++++++++ libquicktime.changes | 6 +++++ libquicktime.spec | 2 ++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 libquicktime-1.2.2-dont_disable_deprecated.patch diff --git a/_service:set_version:libquicktime.spec b/_service:set_version:libquicktime.spec index a02bfb0..71c0edc 100644 --- a/_service:set_version:libquicktime.spec +++ b/_service:set_version:libquicktime.spec @@ -15,6 +15,7 @@ Url: http://libquicktime.sf.net Group: System/Libraries # http://prdownloads.sourceforge.net/libquicktime/libquicktime-%{version}.tar.gz Source: libquicktime-%{version}.tar.bz2 +Patch0: %{name}-1.2.2-dont_disable_deprecated.patch BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: doxygen @@ -67,6 +68,7 @@ Tools for reading/writing quicktime movie files. %prep %setup -q +%patch0 %build %configure \ diff --git a/baselibs.conf b/baselibs.conf index 3993224..da1fffd 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libquicktime +libquicktime0 diff --git a/libquicktime-1.2.2-dont_disable_deprecated.patch b/libquicktime-1.2.2-dont_disable_deprecated.patch new file mode 100644 index 0000000..fbbef3f --- /dev/null +++ b/libquicktime-1.2.2-dont_disable_deprecated.patch @@ -0,0 +1,27 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -398,7 +398,8 @@ AM_CONDITIONAL(HAVE_GTK, test x$have_gtk + AC_SUBST(GTK_REQUIRED) + + dnl Always be in sync with the newest gtk +-GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED" ++dnl Ha ha! I thwart thee! ++GTK_CFLAGS="$GTK_CFLAGS" + + dnl + dnl Check for libdv +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -15899,7 +15899,7 @@ fi + + + +-GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED" ++GTK_CFLAGS="$GTK_CFLAGS" + + + have_libdv="false" diff --git a/libquicktime.changes b/libquicktime.changes index e5c9d3f..3c1635c 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 18 22:53:13 UTC 2011 - reddwarf@opensuse.org + +- fix baselibs.conf +- allow GTK deprectaed functions + ------------------------------------------------------------------- Thu Apr 28 19:27:12 UTC 2011 - reddwarf@opensuse.org diff --git a/libquicktime.spec b/libquicktime.spec index a66a8d4..0615f47 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -15,6 +15,7 @@ Url: http://libquicktime.sf.net Group: System/Libraries # http://prdownloads.sourceforge.net/libquicktime/libquicktime-%{version}.tar.gz Source: libquicktime-%{version}.tar.bz2 +Patch0: %{name}-1.2.2-dont_disable_deprecated.patch BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: doxygen @@ -67,6 +68,7 @@ Tools for reading/writing quicktime movie files. %prep %setup -q +%patch0 %build %configure \