/[pkg-src]/trunk/thunar/patches/thunar-1.8.0-replace-gtk_widget_reparent-with-xfce_widget_reparent_-_no-xfce4-dev-tools.patch |
Annotation of /trunk/thunar/patches/thunar-1.8.0-replace-gtk_widget_reparent-with-xfce_widget_reparent_-_no-xfce4-dev-tools.patch
Parent Directory | Revision Log
Revision 3127 -
(hide annotations)
(download)
Wed Jun 13 06:29:49 2018 UTC (6 years, 3 months ago) by niro
File size: 3233 byte(s)
Wed Jun 13 06:29:49 2018 UTC (6 years, 3 months ago) by niro
File size: 3233 byte(s)
-re-diffed without the requirement of xfce4-dev-tools
1 | niro | 3127 | diff -Naur Thunar-1.8.0/configure Thunar-1.8.0-libxfce4ui-4.12/configure |
2 | --- Thunar-1.8.0/configure 2018-06-06 23:21:37.000000000 +0200 | ||
3 | +++ Thunar-1.8.0-libxfce4ui-4.12/configure 2018-06-13 08:17:17.389481928 +0200 | ||
4 | @@ -18140,9 +18140,9 @@ | ||
5 | |||
6 | |||
7 | |||
8 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.13.2" >&5 | ||
9 | -$as_echo_n "checking for libxfce4ui-2 >= 4.13.2... " >&6; } | ||
10 | - if $PKG_CONFIG "--atleast-version=4.13.2" "libxfce4ui-2" >/dev/null 2>&1; then | ||
11 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4ui-2 >= 4.12.0" >&5 | ||
12 | +$as_echo_n "checking for libxfce4ui-2 >= 4.12.0... " >&6; } | ||
13 | + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfce4ui-2" >/dev/null 2>&1; then | ||
14 | LIBXFCE4UI_VERSION=`$PKG_CONFIG --modversion "libxfce4ui-2"` | ||
15 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_VERSION" >&5 | ||
16 | $as_echo "$LIBXFCE4UI_VERSION" >&6; } | ||
17 | @@ -18159,7 +18159,7 @@ | ||
18 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UI_LIBS" >&5 | ||
19 | $as_echo "$LIBXFCE4UI_LIBS" >&6; } | ||
20 | |||
21 | - LIBXFCE4UI_REQUIRED_VERSION=4.13.2 | ||
22 | + LIBXFCE4UI_REQUIRED_VERSION=4.12.0 | ||
23 | |||
24 | |||
25 | |||
26 | @@ -18175,7 +18175,7 @@ | ||
27 | |||
28 | echo "*** The required package libxfce4ui-2 was found on your system," | ||
29 | echo "*** but the installed version ($xdt_cv_version) is too old." | ||
30 | - echo "*** Please upgrade libxfce4ui-2 to atleast version 4.13.2, or adjust" | ||
31 | + echo "*** Please upgrade libxfce4ui-2 to atleast version 4.12.0, or adjust" | ||
32 | echo "*** the PKG_CONFIG_PATH environment variable if you installed" | ||
33 | echo "*** the new version of the package in a nonstandard prefix so" | ||
34 | echo "*** pkg-config is able to find it." | ||
35 | @@ -18187,7 +18187,7 @@ | ||
36 | |||
37 | |||
38 | echo "*** The required package libxfce4ui-2 was not found on your system." | ||
39 | - echo "*** Please install libxfce4ui-2 (atleast version 4.13.2) or adjust" | ||
40 | + echo "*** Please install libxfce4ui-2 (atleast version 4.12.0) or adjust" | ||
41 | echo "*** the PKG_CONFIG_PATH environment variable if you" | ||
42 | echo "*** installed the package in a nonstandard prefix so that" | ||
43 | echo "*** pkg-config is able to find it." | ||
44 | diff -Naur Thunar-1.8.0/thunar/thunar-progress-dialog.c Thunar-1.8.0-libxfce4ui-4.12/thunar/thunar-progress-dialog.c | ||
45 | --- Thunar-1.8.0/thunar/thunar-progress-dialog.c 2018-06-06 21:44:27.000000000 +0200 | ||
46 | +++ Thunar-1.8.0-libxfce4ui-4.12/thunar/thunar-progress-dialog.c 2018-06-13 08:15:17.703012100 +0200 | ||
47 | @@ -24,8 +24,6 @@ | ||
48 | |||
49 | #include <gtk/gtk.h> | ||
50 | |||
51 | -#include <libxfce4ui/libxfce4ui.h> | ||
52 | - | ||
53 | #include <thunar/thunar-private.h> | ||
54 | #include <thunar/thunar-progress-dialog.h> | ||
55 | #include <thunar/thunar-progress-view.h> | ||
56 | @@ -260,7 +258,7 @@ | ||
57 | if (n_views == SCROLLVIEW_THRESHOLD-1) | ||
58 | { | ||
59 | /* reparent the content box */ | ||
60 | - xfce_widget_reparent (dialog->content_box, dialog->vbox); | ||
61 | + gtk_widget_reparent (dialog->content_box, dialog->vbox); | ||
62 | |||
63 | /* destroy the scroll win */ | ||
64 | gtk_widget_destroy (dialog->scrollwin); | ||
65 | @@ -375,7 +373,7 @@ | ||
66 | gtk_widget_show (viewport); | ||
67 | |||
68 | /* move the content box into the viewport */ | ||
69 | - xfce_widget_reparent (dialog->content_box, viewport); | ||
70 | + gtk_widget_reparent (dialog->content_box, viewport); | ||
71 | } | ||
72 | |||
73 | g_signal_connect_swapped (view, "need-attention", |