wok-next rev 6864
Fixed libquicktime. Added patch so it can compile with gtk+ 2.22.0.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Wed Oct 20 13:17:30 2010 +0000 (2010-10-20) |
parents | 2ecfb88314ac |
children | 2fd0972c0c88 |
files | libquicktime-dev/receipt libquicktime/receipt libquicktime/stuff/gtk22.patch |
line diff
1.1 --- a/libquicktime-dev/receipt Wed Oct 20 12:56:13 2010 +0000 1.2 +++ b/libquicktime-dev/receipt Wed Oct 20 13:17:30 2010 +0000 1.3 @@ -6,9 +6,9 @@ 1.4 MAINTAINER="jozee@slitaz.org" 1.5 SHORT_DESC="libquicktime devel files" 1.6 WEB_SITE="http://libquicktime.sourceforge.net/" 1.7 +DEPENDS="libquicktime" 1.8 WANTED="libquicktime" 1.9 1.10 - 1.11 # Rules to gen a SliTaz package suitable for Tazpkg. 1.12 genpkg_rules() 1.13 {
2.1 --- a/libquicktime/receipt Wed Oct 20 12:56:13 2010 +0000 2.2 +++ b/libquicktime/receipt Wed Oct 20 13:17:30 2010 +0000 2.3 @@ -6,8 +6,8 @@ 2.4 MAINTAINER="jozee@slitaz.org" 2.5 SHORT_DESC="A library for reading and writing quicktime files." 2.6 WEB_SITE="http://libquicktime.sourceforge.net/" 2.7 -DEPENDS="gtk+ ffmpeg-svn alsa-lib xorg-libXv libgl xorg-libXaw x264" 2.8 -BUILD_DEPENDS=" gtk+-dev ffmpeg-svn-dev alsa-lib-dev xorg-libXaw-dev x264-dev" 2.9 +DEPENDS="gtk+ ffmpeg alsa-lib xorg-libXv mesa xorg-libXaw x264" 2.10 +BUILD_DEPENDS="gtk+-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev x264-dev zlib-dev mesa-dev" 2.11 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.12 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 2.13 2.14 @@ -15,6 +15,7 @@ 2.15 2.16 compile_rules() { 2.17 cd $src 2.18 + patch -Np1 -i ../stuff/gtk22.patch 2.19 ./configure --prefix=/usr \ 2.20 --enable-gpl \ 2.21 --with-ffmpeg \ 2.22 @@ -31,5 +32,4 @@ 2.23 cp -a $_pkg/usr/bin $fs/usr 2.24 cp -a $_pkg/usr/lib/*so* $fs/usr/lib/ 2.25 cp -a $_pkg/usr/lib/$PACKAGE/*so* $fs/usr/lib/$PACKAGE 2.26 - 2.27 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/libquicktime/stuff/gtk22.patch Wed Oct 20 13:17:30 2010 +0000 3.3 @@ -0,0 +1,41 @@ 3.4 +diff -Nur libquicktime-1.1.5.orig/utils/gtk/libquicktime_config.c libquicktime-1.1.5/utils/gtk/libquicktime_config.c 3.5 +--- libquicktime-1.1.5.orig/utils/gtk/libquicktime_config.c 2008-12-30 08:05:36.000000000 -0800 3.6 ++++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c 2010-10-15 05:46:21.956697112 -0700 3.7 +@@ -112,9 +112,9 @@ 3.8 + G_CALLBACK(main_window_button_callback), 3.9 + (gpointer)ret); 3.10 + 3.11 +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); 3.12 +- GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT); 3.13 +- 3.14 ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); 3.15 ++ gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE); 3.16 ++ 3.17 + gtk_widget_show(ret->close_button); 3.18 + gtk_widget_show(ret->save_button); 3.19 + 3.20 +diff -Nur libquicktime-1.1.5.orig/utils/gtk/lqt_gtk.c libquicktime-1.1.5/utils/gtk/lqt_gtk.c 3.21 +--- libquicktime-1.1.5.orig/utils/gtk/lqt_gtk.c 2009-03-11 07:25:50.000000000 -0700 3.22 ++++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c 2010-10-15 05:47:14.720013265 -0700 3.23 +@@ -941,9 +941,9 @@ 3.24 + G_CALLBACK(codec_config_window_button_callback), 3.25 + (gpointer)ret); 3.26 + 3.27 +- GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT); 3.28 +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); 3.29 +- GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT); 3.30 ++ gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE); 3.31 ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); 3.32 ++ gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE); 3.33 + 3.34 + gtk_widget_show(ret->apply_button); 3.35 + gtk_widget_show(ret->close_button); 3.36 +@@ -1240,7 +1240,7 @@ 3.37 + ret->mainbox = gtk_vbox_new(0, 10); 3.38 + 3.39 + ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); 3.40 +- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT); 3.41 ++ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE); 3.42 + 3.43 + g_signal_connect(G_OBJECT(ret->close_button), "clicked", 3.44 + G_CALLBACK(codec_info_window_button_callback),