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