1 |
radhermit 11/11/18 11:07:13 |
2 |
|
3 |
Added: ogmrip-0.13.7-deprecated.patch |
4 |
Log: |
5 |
Version bump (bug #386587 by Olivier Rolland). |
6 |
|
7 |
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: ogmrip-0.13.7-deprecated.patch |
16 |
=================================================================== |
17 |
--- configure.in |
18 |
+++ configure.in |
19 |
@@ -38,7 +38,6 @@ |
20 |
AM_MAINTAINER_MODE |
21 |
|
22 |
CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2" |
23 |
-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" |
24 |
CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" |
25 |
|
26 |
CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2" |
27 |
--- ChangeLog |
28 |
+++ ChangeLog |
29 |
@@ -1,5 +1,15 @@ |
30 |
-19 Aug 2011 Olivier Rolland <billl@××××××××.net> |
31 |
+9 Oct 2011 Olivier Rolland <billl@××××××××.net> |
32 |
|
33 |
+ * configure.in |
34 |
+ * src/ogmrip-profile-editor.c |
35 |
+ * src/ogmrip-crop-dialog.c |
36 |
+ * libogmrip-gtk/ogmrip-source-chooser-widget.c |
37 |
+ * libogmrip-gtk/ogmrip-x264-options.c |
38 |
+ |
39 |
+ Removed deprecated GTK+ functions |
40 |
+ |
41 |
+19 Sep 2011 Olivier Rolland <billl@××××××××.net> |
42 |
+ |
43 |
Released OGMRip-0.13.7 |
44 |
|
45 |
19 Sep 2011 Olivier Rolland <billl@××××××××.net> |
46 |
--- src/ogmrip-profile-editor.c |
47 |
+++ src/ogmrip-profile-editor.c |
48 |
@@ -631,6 +631,7 @@ |
49 |
{ |
50 |
GType codec; |
51 |
GtkTreeModel *model; |
52 |
+ GtkTreeIter iter; |
53 |
gboolean exists; |
54 |
gint active; |
55 |
gchar *name; |
56 |
@@ -641,11 +642,15 @@ |
57 |
codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name); |
58 |
g_free (name); |
59 |
|
60 |
- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER); |
61 |
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER)) |
62 |
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter); |
63 |
|
64 |
exists = ogmrip_options_plugin_exists (codec); |
65 |
if (exists) |
66 |
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User")); |
67 |
+ { |
68 |
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); |
69 |
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1); |
70 |
+ } |
71 |
|
72 |
active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo)); |
73 |
|
74 |
--- src/ogmrip-crop-dialog.c |
75 |
+++ src/ogmrip-crop-dialog.c |
76 |
@@ -218,17 +218,20 @@ |
77 |
} |
78 |
|
79 |
static void |
80 |
-ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog *dialog, GtkWidget *scale) |
81 |
+ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale) |
82 |
{ |
83 |
- gulong frame; |
84 |
- gchar *text; |
85 |
+ if (event->button == 1) |
86 |
+ { |
87 |
+ gulong frame; |
88 |
+ gchar *text; |
89 |
|
90 |
- frame = (guint) gtk_range_get_value (GTK_RANGE (scale)); |
91 |
- text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length); |
92 |
- gtk_label_set_text (GTK_LABEL (dialog->priv->label), text); |
93 |
- g_free (text); |
94 |
+ frame = (guint) gtk_range_get_value (GTK_RANGE (scale)); |
95 |
+ text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length); |
96 |
+ gtk_label_set_text (GTK_LABEL (dialog->priv->label), text); |
97 |
+ g_free (text); |
98 |
|
99 |
- ogmrip_crop_dialog_grab_frame (dialog, frame); |
100 |
+ ogmrip_crop_dialog_grab_frame (dialog, frame); |
101 |
+ } |
102 |
} |
103 |
|
104 |
G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG) |
105 |
@@ -291,9 +294,8 @@ |
106 |
dialog->priv->label = glade_xml_get_widget (xml, "frame-label"); |
107 |
|
108 |
dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale"); |
109 |
- gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED); |
110 |
- g_signal_connect_swapped (dialog->priv->scale, "value-changed", |
111 |
- G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog); |
112 |
+ g_signal_connect_swapped (dialog->priv->scale, "button-release-event", |
113 |
+ G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog); |
114 |
|
115 |
g_object_unref (xml); |
116 |
} |
117 |
--- libogmrip-gtk/ogmrip-source-chooser-widget.c |
118 |
+++ libogmrip-gtk/ogmrip-source-chooser-widget.c |
119 |
@@ -207,7 +207,12 @@ |
120 |
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); |
121 |
gtk_widget_show (label); |
122 |
|
123 |
+#if GTK_CHECK_VERSION(2,24,0) |
124 |
+ combo = gtk_combo_box_text_new (); |
125 |
+#else |
126 |
combo = gtk_combo_box_new_text (); |
127 |
+#endif |
128 |
+ |
129 |
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); |
130 |
gtk_widget_show (combo); |
131 |
|
132 |
@@ -231,7 +236,11 @@ |
133 |
{ |
134 |
str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME], |
135 |
ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]); |
136 |
+#if GTK_CHECK_VERSION(2,24,0) |
137 |
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str); |
138 |
+#else |
139 |
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str); |
140 |
+#endif |
141 |
g_free (str); |
142 |
|
143 |
if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0) |
144 |
--- libogmrip-gtk/ogmrip-x264-options.c |
145 |
+++ libogmrip-gtk/ogmrip-x264-options.c |
146 |
@@ -299,9 +299,16 @@ |
147 |
gtk_widget_set_sensitive (dialog->me_combo, x264_have_me); |
148 |
|
149 |
if (x264_have_me_tesa) |
150 |
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo), |
151 |
- _("Transformed Exhaustive search (tesa - even slower)")); |
152 |
+ { |
153 |
+ GtkTreeModel *model; |
154 |
+ GtkTreeIter iter; |
155 |
|
156 |
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo)); |
157 |
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); |
158 |
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, |
159 |
+ 0, _("Transformed Exhaustive search (tesa - even slower)"), -1); |
160 |
+ } |
161 |
+ |
162 |
dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin"); |
163 |
gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me); |