From f4f08f6442c91827703c1c60c841568a73728d11 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Thu, 17 Aug 2006 15:48:32 +0200 Subject: [PATCH] Add Xournal 0.3 including a (re-diffed) patch from poky to remove libgnomeprintui dependency. Signed-off-by: Rene Wagner --- .../packages/xournal/files/no-printing.diff | 178 ++++++++++++++++++ .../packages/xournal/files/xournal.desktop | 11 ++ .../packages/xournal/xournal_0.3.bb | 19 ++ 3 files changed, 208 insertions(+) create mode 100644 org.handhelds.familiar/packages/xournal/files/no-printing.diff create mode 100644 org.handhelds.familiar/packages/xournal/files/xournal.desktop create mode 100644 org.handhelds.familiar/packages/xournal/xournal_0.3.bb diff --git a/org.handhelds.familiar/packages/xournal/files/no-printing.diff b/org.handhelds.familiar/packages/xournal/files/no-printing.diff new file mode 100644 index 0000000..9884ff4 --- /dev/null +++ b/org.handhelds.familiar/packages/xournal/files/no-printing.diff @@ -0,0 +1,178 @@ +diff -Naur xournal-0.3/configure.in xournal-0.3.no-printing/configure.in +--- xournal-0.3/configure.in 2006-07-22 20:35:09.000000000 +0200 ++++ xournal-0.3.no-printing/configure.in 2006-07-30 21:07:18.000000000 +0200 +@@ -10,11 +10,16 @@ + AM_PROG_CC_STDC + AC_HEADER_STDC + +-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0" ++pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0" + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) + AC_SUBST(PACKAGE_CFLAGS) + AC_SUBST(PACKAGE_LIBS) + ++#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0 ++#AC_SUBST(GNOMEPRINT_CFLAGS) ++#AC_SUBST(GNOMEPRINT_LIBS) ++AM_CONDITIONAL(ENABLE_PRINTING, false) ++ + AC_OUTPUT([ + Makefile + src/Makefile +diff -Naur xournal-0.3/src/Makefile.am xournal-0.3.no-printing/src/Makefile.am +--- xournal-0.3/src/Makefile.am 2005-12-14 21:54:42.000000000 +0100 ++++ xournal-0.3.no-printing/src/Makefile.am 2006-07-30 21:07:18.000000000 +0200 +@@ -7,12 +7,16 @@ + + bin_PROGRAMS = xournal + ++if ENABLE_PRINTING ++PRINT_SOURCE = xo-print.c xo-print.h ++endif ++ + xournal_SOURCES = \ + main.c xournal.h \ + xo-misc.c xo-misc.h \ + xo-file.c xo-file.h \ + xo-paint.c xo-paint.h \ +- xo-print.c xo-print.h \ ++ $(PRINT_SOURCE) \ + xo-support.c xo-support.h \ + xo-interface.c xo-interface.h \ + xo-callbacks.c xo-callbacks.h +diff -Naur xournal-0.3/src/main.c xournal-0.3.no-printing/src/main.c +--- xournal-0.3/src/main.c 2006-06-05 23:26:09.000000000 +0200 ++++ xournal-0.3.no-printing/src/main.c 2006-07-30 21:07:18.000000000 +0200 +@@ -28,7 +28,9 @@ + + void hide_unimplemented(void) + { ++#if ENABLE_PRINTING + gtk_widget_hide(GET_COMPONENT("filePrintOptions")); ++#endif + gtk_widget_hide(GET_COMPONENT("journalFlatten")); + gtk_widget_hide(GET_COMPONENT("papercolorOther")); + gtk_widget_hide(GET_COMPONENT("toolsText")); +diff -Naur xournal-0.3/src/xo-callbacks.c xournal-0.3.no-printing/src/xo-callbacks.c +--- xournal-0.3/src/xo-callbacks.c 2006-07-23 00:22:15.000000000 +0200 ++++ xournal-0.3.no-printing/src/xo-callbacks.c 2006-07-30 21:07:18.000000000 +0200 +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if ENABLE_PRINTING + #include ++#endif + #include + + #include "xournal.h" +@@ -17,7 +19,9 @@ + #include "xo-misc.h" + #include "xo-file.h" + #include "xo-paint.h" ++#if ENABLE_PRINTING + #include "xo-print.h" ++#endif + + void + on_fileNew_activate (GtkMenuItem *menuitem, +@@ -268,7 +272,7 @@ + + } + +- ++#if ENABLE_PRINTING + void + on_filePrint_activate (GtkMenuItem *menuitem, + gpointer user_data) +@@ -424,7 +428,7 @@ + set_cursor_busy(FALSE); + g_free(filename); + } +- ++#endif + + void + on_fileQuit_activate (GtkMenuItem *menuitem, +diff -Naur xournal-0.3/src/xo-callbacks.h xournal-0.3.no-printing/src/xo-callbacks.h +--- xournal-0.3/src/xo-callbacks.h 2006-07-22 23:53:50.000000000 +0200 ++++ xournal-0.3.no-printing/src/xo-callbacks.h 2006-07-30 21:07:18.000000000 +0200 +@@ -24,6 +24,7 @@ + on_filePrintOptions_activate (GtkMenuItem *menuitem, + gpointer user_data); + ++#if ENABLE_PRINTING + void + on_filePrint_activate (GtkMenuItem *menuitem, + gpointer user_data); +@@ -32,6 +33,8 @@ + on_filePrintPDF_activate (GtkMenuItem *menuitem, + gpointer user_data); + ++#endif ++ + void + on_fileQuit_activate (GtkMenuItem *menuitem, + gpointer user_data); +diff -Naur xournal-0.3/src/xo-interface.c xournal-0.3.no-printing/src/xo-interface.c +--- xournal-0.3/src/xo-interface.c 2006-07-22 23:53:50.000000000 +0200 ++++ xournal-0.3.no-printing/src/xo-interface.c 2006-07-30 21:12:02.000000000 +0200 +@@ -52,10 +52,12 @@ + GtkWidget *mru6; + GtkWidget *mru7; + GtkWidget *separator22; ++#if ENABLE_PRINTING + GtkWidget *filePrintOptions; + GtkWidget *image600; + GtkWidget *filePrint; + GtkWidget *filePrintPDF; ++#endif + GtkWidget *separator2; + GtkWidget *fileQuit; + GtkWidget *menuEdit; +@@ -415,6 +417,7 @@ + gtk_container_add (GTK_CONTAINER (menuFile_menu), separator22); + gtk_widget_set_sensitive (separator22, FALSE); + ++#if ENABLE_PRINTING + filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options"); + gtk_widget_show (filePrintOptions); + gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions); +@@ -435,6 +438,7 @@ + gtk_widget_show (separator2); + gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2); + gtk_widget_set_sensitive (separator2, FALSE); ++#endif + + fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group); + gtk_widget_show (fileQuit); +@@ -1790,6 +1794,7 @@ + g_signal_connect ((gpointer) mru7, "activate", + G_CALLBACK (on_mru_activate), + NULL); ++#if ENABLE_PRINTING + g_signal_connect ((gpointer) filePrintOptions, "activate", + G_CALLBACK (on_filePrintOptions_activate), + NULL); +@@ -1799,6 +1804,7 @@ + g_signal_connect ((gpointer) filePrintPDF, "activate", + G_CALLBACK (on_filePrintPDF_activate), + NULL); ++#endif + g_signal_connect ((gpointer) fileQuit, "activate", + G_CALLBACK (on_fileQuit_activate), + NULL); +@@ -2280,11 +2286,13 @@ + GLADE_HOOKUP_OBJECT (winMain, mru6, "mru6"); + GLADE_HOOKUP_OBJECT (winMain, mru7, "mru7"); + GLADE_HOOKUP_OBJECT (winMain, separator22, "separator22"); ++#if ENABLE_PRINTING + GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions"); + GLADE_HOOKUP_OBJECT (winMain, image600, "image600"); + GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint"); + GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF"); + GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2"); ++#endif + GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit"); + GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit"); + GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu"); diff --git a/org.handhelds.familiar/packages/xournal/files/xournal.desktop b/org.handhelds.familiar/packages/xournal/files/xournal.desktop new file mode 100644 index 0000000..ef1d537 --- /dev/null +++ b/org.handhelds.familiar/packages/xournal/files/xournal.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Notes +Name[de]=Notizen +Comment=Xournal Notetaking Application +Exec=xournal +Terminal=false +Type=Application +Icon=xournal.png +Categories=Application;Office;PIM;GPE; +StartupNotify=true diff --git a/org.handhelds.familiar/packages/xournal/xournal_0.3.bb b/org.handhelds.familiar/packages/xournal/xournal_0.3.bb new file mode 100644 index 0000000..918cf46 --- /dev/null +++ b/org.handhelds.familiar/packages/xournal/xournal_0.3.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A stylus driven notetaking and journaling application" +DEPENDS = "gtk+ libgnomecanvas" +LICENSE = "GPL" + +SRC_URI = "http://math.mit.edu/~auroux/software/${PN}/${PN}-${PV}.tar.gz \ + file://no-printing.diff;patch=1 \ + file://xournal.desktop" + +inherit autotools + +PACKAGES = "${PN}-doc ${PN}" +FILES_${PN}-doc = "${datadir}/${PN}/html-doc" + +do_install_append () { + install -d ${D}${datadir}/applications + install -m 644 ${WORKDIR}/xournal.desktop ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + ln -s ../${PN}/pixmaps/notepad.png ${D}${datadir}/pixmaps/xournal.png +} -- 2.41.1