# HG changeset patch # User Christopher Rogers # Date 1287580650 0 # Node ID 177f9bfbbcc3aabcc938e6d170ece470ae446088 # Parent 2ecfb88314ac06a6af002c5dca4b1a519f7eb872 Fixed libquicktime. Added patch so it can compile with gtk+ 2.22.0. diff -r 2ecfb88314ac -r 177f9bfbbcc3 libquicktime-dev/receipt --- a/libquicktime-dev/receipt Wed Oct 20 12:56:13 2010 +0000 +++ b/libquicktime-dev/receipt Wed Oct 20 13:17:30 2010 +0000 @@ -6,9 +6,9 @@ MAINTAINER="jozee@slitaz.org" SHORT_DESC="libquicktime devel files" WEB_SITE="http://libquicktime.sourceforge.net/" +DEPENDS="libquicktime" WANTED="libquicktime" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 2ecfb88314ac -r 177f9bfbbcc3 libquicktime/receipt --- a/libquicktime/receipt Wed Oct 20 12:56:13 2010 +0000 +++ b/libquicktime/receipt Wed Oct 20 13:17:30 2010 +0000 @@ -6,8 +6,8 @@ MAINTAINER="jozee@slitaz.org" SHORT_DESC="A library for reading and writing quicktime files." WEB_SITE="http://libquicktime.sourceforge.net/" -DEPENDS="gtk+ ffmpeg-svn alsa-lib xorg-libXv libgl xorg-libXaw x264" -BUILD_DEPENDS=" gtk+-dev ffmpeg-svn-dev alsa-lib-dev xorg-libXaw-dev x264-dev" +DEPENDS="gtk+ ffmpeg alsa-lib xorg-libXv mesa xorg-libXaw x264" +BUILD_DEPENDS="gtk+-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev x264-dev zlib-dev mesa-dev" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" @@ -15,6 +15,7 @@ compile_rules() { cd $src + patch -Np1 -i ../stuff/gtk22.patch ./configure --prefix=/usr \ --enable-gpl \ --with-ffmpeg \ @@ -31,5 +32,4 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/lib/*so* $fs/usr/lib/ cp -a $_pkg/usr/lib/$PACKAGE/*so* $fs/usr/lib/$PACKAGE - } diff -r 2ecfb88314ac -r 177f9bfbbcc3 libquicktime/stuff/gtk22.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libquicktime/stuff/gtk22.patch Wed Oct 20 13:17:30 2010 +0000 @@ -0,0 +1,41 @@ +diff -Nur libquicktime-1.1.5.orig/utils/gtk/libquicktime_config.c libquicktime-1.1.5/utils/gtk/libquicktime_config.c +--- libquicktime-1.1.5.orig/utils/gtk/libquicktime_config.c 2008-12-30 08:05:36.000000000 -0800 ++++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c 2010-10-15 05:46:21.956697112 -0700 +@@ -112,9 +112,9 @@ + G_CALLBACK(main_window_button_callback), + (gpointer)ret); + +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); +- GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT); +- ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE); ++ + gtk_widget_show(ret->close_button); + gtk_widget_show(ret->save_button); + +diff -Nur libquicktime-1.1.5.orig/utils/gtk/lqt_gtk.c libquicktime-1.1.5/utils/gtk/lqt_gtk.c +--- libquicktime-1.1.5.orig/utils/gtk/lqt_gtk.c 2009-03-11 07:25:50.000000000 -0700 ++++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c 2010-10-15 05:47:14.720013265 -0700 +@@ -941,9 +941,9 @@ + G_CALLBACK(codec_config_window_button_callback), + (gpointer)ret); + +- GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT); +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); +- GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE); + + gtk_widget_show(ret->apply_button); + gtk_widget_show(ret->close_button); +@@ -1240,7 +1240,7 @@ + ret->mainbox = gtk_vbox_new(0, 10); + + ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); + + g_signal_connect(G_OBJECT(ret->close_button), "clicked", + G_CALLBACK(codec_info_window_button_callback),