summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta-demoapps/recipes-graphics/xournal/files/no-printing.diff')
-rw-r--r--meta-demoapps/recipes-graphics/xournal/files/no-printing.diff180
1 files changed, 0 insertions, 180 deletions
diff --git a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff b/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
deleted file mode 100644
index 9fac498084..0000000000
--- a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
+++ /dev/null
@@ -1,180 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
4--- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000
5+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000
6@@ -10,11 +10,16 @@
7 AM_PROG_CC_STDC
8 AC_HEADER_STDC
9
10-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
11+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
12 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
13 AC_SUBST(PACKAGE_CFLAGS)
14 AC_SUBST(PACKAGE_LIBS)
15
16+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
17+#AC_SUBST(GNOMEPRINT_CFLAGS)
18+#AC_SUBST(GNOMEPRINT_LIBS)
19+AM_CONDITIONAL(ENABLE_PRINTING, false)
20+
21 AC_OUTPUT([
22 Makefile
23 src/Makefile
24diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c
25--- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000
26+++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000
27@@ -28,7 +28,9 @@
28
29 void hide_unimplemented(void)
30 {
31+#if ENABLE_PRINTING
32 gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
33+#endif
34 gtk_widget_hide(GET_COMPONENT("journalFlatten"));
35 gtk_widget_hide(GET_COMPONENT("papercolorOther"));
36 gtk_widget_hide(GET_COMPONENT("journalApplyAllPages"));
37diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am
38--- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000
39+++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000
40@@ -7,12 +7,16 @@
41
42 bin_PROGRAMS = xournal
43
44+if ENABLE_PRINTING
45+PRINT_SOURCE = xo-print.c xo-print.h
46+endif
47+
48 xournal_SOURCES = \
49 main.c xournal.h \
50 xo-misc.c xo-misc.h \
51 xo-file.c xo-file.h \
52 xo-paint.c xo-paint.h \
53- xo-print.c xo-print.h \
54+ $(PRINT_SOURCE) \
55 xo-support.c xo-support.h \
56 xo-interface.c xo-interface.h \
57 xo-callbacks.c xo-callbacks.h
58diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c
59--- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000
60+++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000
61@@ -7,7 +7,9 @@
62 #include <gtk/gtk.h>
63 #include <libgnomecanvas/libgnomecanvas.h>
64 #include <time.h>
65+#if ENABLE_PRINTING
66 #include <libgnomeprintui/gnome-print-dialog.h>
67+#endif
68 #include <glib/gstdio.h>
69
70 #include "xournal.h"
71@@ -17,7 +19,9 @@
72 #include "xo-misc.h"
73 #include "xo-file.h"
74 #include "xo-paint.h"
75+#if ENABLE_PRINTING
76 #include "xo-print.h"
77+#endif
78
79 void
80 on_fileNew_activate (GtkMenuItem *menuitem,
81@@ -261,7 +265,7 @@
82
83 }
84
85-
86+#if ENABLE_PRINTING
87 void
88 on_filePrint_activate (GtkMenuItem *menuitem,
89 gpointer user_data)
90@@ -407,7 +411,7 @@
91
92 g_free(filename);
93 }
94-
95+#endif
96
97 void
98 on_fileQuit_activate (GtkMenuItem *menuitem,
99diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h
100--- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000
101+++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000
102@@ -24,6 +24,7 @@
103 on_filePrintOptions_activate (GtkMenuItem *menuitem,
104 gpointer user_data);
105
106+#if ENABLE_PRINTING
107 void
108 on_filePrint_activate (GtkMenuItem *menuitem,
109 gpointer user_data);
110@@ -32,6 +33,8 @@
111 on_filePrintPDF_activate (GtkMenuItem *menuitem,
112 gpointer user_data);
113
114+#endif
115+
116 void
117 on_fileQuit_activate (GtkMenuItem *menuitem,
118 gpointer user_data);
119diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c
120--- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000
121+++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000
122@@ -41,10 +41,12 @@
123 GtkWidget *fileSave;
124 GtkWidget *fileSaveAs;
125 GtkWidget *separator1;
126+#if ENABLE_PRINTING
127 GtkWidget *filePrintOptions;
128 GtkWidget *image501;
129 GtkWidget *filePrint;
130 GtkWidget *filePrintPDF;
131+#endif
132 GtkWidget *separator2;
133 GtkWidget *fileQuit;
134 GtkWidget *menuEdit;
135@@ -327,6 +329,7 @@
136 gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
137 gtk_widget_set_sensitive (separator1, FALSE);
138
139+#if ENABLE_PRINTING
140 filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
141 gtk_widget_show (filePrintOptions);
142 gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
143@@ -347,6 +350,7 @@
144 gtk_widget_show (separator2);
145 gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
146 gtk_widget_set_sensitive (separator2, FALSE);
147+#endif
148
149 fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
150 gtk_widget_show (fileQuit);
151@@ -1522,6 +1526,7 @@
152 g_signal_connect ((gpointer) fileSaveAs, "activate",
153 G_CALLBACK (on_fileSaveAs_activate),
154 NULL);
155+#if ENABLE_PRINTING
156 g_signal_connect ((gpointer) filePrintOptions, "activate",
157 G_CALLBACK (on_filePrintOptions_activate),
158 NULL);
159@@ -1531,6 +1536,7 @@
160 g_signal_connect ((gpointer) filePrintPDF, "activate",
161 G_CALLBACK (on_filePrintPDF_activate),
162 NULL);
163+#endif
164 g_signal_connect ((gpointer) fileQuit, "activate",
165 G_CALLBACK (on_fileQuit_activate),
166 NULL);
167@@ -1941,11 +1947,13 @@
168 GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave");
169 GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs");
170 GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
171+#if ENABLE_PRINTING
172 GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
173 GLADE_HOOKUP_OBJECT (winMain, image501, "image501");
174 GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint");
175 GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF");
176 GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2");
177+#endif
178 GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit");
179 GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit");
180 GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu");
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-01 02:10:36 +0000