From d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Sep 2010 19:09:11 +0100 Subject: packages: Separate out most of the remaining packages into recipes Signed-off-by: Richard Purdie --- meta/recipes-tbd/poppler/poppler-data_0.1.bb | 16 +++ meta/recipes-tbd/poppler/poppler-fpu.inc | 6 + meta/recipes-tbd/poppler/poppler.inc | 18 +++ meta/recipes-tbd/poppler/poppler_0.9.2.bb | 2 + meta/recipes-tbd/xournal/files/ldflags.patch | 15 ++ meta/recipes-tbd/xournal/files/no-printing.diff | 178 ++++++++++++++++++++++++ meta/recipes-tbd/xournal/xournal_0.2.bb | 12 ++ 7 files changed, 247 insertions(+) create mode 100644 meta/recipes-tbd/poppler/poppler-data_0.1.bb create mode 100644 meta/recipes-tbd/poppler/poppler-fpu.inc create mode 100644 meta/recipes-tbd/poppler/poppler.inc create mode 100644 meta/recipes-tbd/poppler/poppler_0.9.2.bb create mode 100644 meta/recipes-tbd/xournal/files/ldflags.patch create mode 100644 meta/recipes-tbd/xournal/files/no-printing.diff create mode 100644 meta/recipes-tbd/xournal/xournal_0.2.bb (limited to 'meta/recipes-tbd') diff --git a/meta/recipes-tbd/poppler/poppler-data_0.1.bb b/meta/recipes-tbd/poppler/poppler-data_0.1.bb new file mode 100644 index 0000000000..ca22e4dba0 --- /dev/null +++ b/meta/recipes-tbd/poppler/poppler-data_0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +LICENSE = "Adobe" +PR = "r0" + +SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +do_compile() { +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + +FILES_${PN} += "${datadir}" +PACKAGE_ARCH = "all" + diff --git a/meta/recipes-tbd/poppler/poppler-fpu.inc b/meta/recipes-tbd/poppler/poppler-fpu.inc new file mode 100644 index 0000000000..a26273020a --- /dev/null +++ b/meta/recipes-tbd/poppler/poppler-fpu.inc @@ -0,0 +1,6 @@ + +def get_poppler_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--enable-fixedpoint" + return "" + diff --git a/meta/recipes-tbd/poppler/poppler.inc b/meta/recipes-tbd/poppler/poppler.inc new file mode 100644 index 0000000000..645e734e8b --- /dev/null +++ b/meta/recipes-tbd/poppler/poppler.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +DEPENDS = "fontconfig jpeg zlib gtk+ cairo" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-xpdf-headers \ + --disable-gtk-test \ + --disable-poppler-qt --disable-poppler-qt4 \ + --enable-zlib \ + " + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require poppler-fpu.inc +EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" diff --git a/meta/recipes-tbd/poppler/poppler_0.9.2.bb b/meta/recipes-tbd/poppler/poppler_0.9.2.bb new file mode 100644 index 0000000000..92c25bc0ac --- /dev/null +++ b/meta/recipes-tbd/poppler/poppler_0.9.2.bb @@ -0,0 +1,2 @@ +require poppler.inc +PR = "r2" diff --git a/meta/recipes-tbd/xournal/files/ldflags.patch b/meta/recipes-tbd/xournal/files/ldflags.patch new file mode 100644 index 0000000000..7f6585befb --- /dev/null +++ b/meta/recipes-tbd/xournal/files/ldflags.patch @@ -0,0 +1,15 @@ +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: xournal-0.2/src/Makefile.am +=================================================================== +--- xournal-0.2.orig/src/Makefile.am 2007-05-09 15:06:26.000000000 +0100 ++++ xournal-0.2/src/Makefile.am 2007-05-09 15:06:35.000000000 +0100 +@@ -21,5 +21,5 @@ xournal_SOURCES = \ + xo-interface.c xo-interface.h \ + xo-callbacks.c xo-callbacks.h + +-xournal_LDADD = @PACKAGE_LIBS@ ++xournal_LDADD = @PACKAGE_LIBS@ -lz + diff --git a/meta/recipes-tbd/xournal/files/no-printing.diff b/meta/recipes-tbd/xournal/files/no-printing.diff new file mode 100644 index 0000000000..7a4724e696 --- /dev/null +++ b/meta/recipes-tbd/xournal/files/no-printing.diff @@ -0,0 +1,178 @@ +diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in +--- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000 ++++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000 +@@ -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 -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c +--- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000 ++++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000 +@@ -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("journalApplyAllPages")); +diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am +--- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000 ++++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000 +@@ -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 -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c +--- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000 ++++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000 +@@ -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, +@@ -261,7 +265,7 @@ + + } + +- ++#if ENABLE_PRINTING + void + on_filePrint_activate (GtkMenuItem *menuitem, + gpointer user_data) +@@ -407,7 +411,7 @@ + + g_free(filename); + } +- ++#endif + + void + on_fileQuit_activate (GtkMenuItem *menuitem, +diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h +--- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000 ++++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000 +@@ -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 -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c +--- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000 ++++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000 +@@ -41,10 +41,12 @@ + GtkWidget *fileSave; + GtkWidget *fileSaveAs; + GtkWidget *separator1; ++#if ENABLE_PRINTING + GtkWidget *filePrintOptions; + GtkWidget *image501; + GtkWidget *filePrint; + GtkWidget *filePrintPDF; ++#endif + GtkWidget *separator2; + GtkWidget *fileQuit; + GtkWidget *menuEdit; +@@ -327,6 +329,7 @@ + gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1); + gtk_widget_set_sensitive (separator1, 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); +@@ -347,6 +350,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); +@@ -1522,6 +1526,7 @@ + g_signal_connect ((gpointer) fileSaveAs, "activate", + G_CALLBACK (on_fileSaveAs_activate), + NULL); ++#if ENABLE_PRINTING + g_signal_connect ((gpointer) filePrintOptions, "activate", + G_CALLBACK (on_filePrintOptions_activate), + NULL); +@@ -1531,6 +1536,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); +@@ -1941,11 +1947,13 @@ + GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave"); + GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs"); + GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1"); ++#if ENABLE_PRINTING + GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions"); + GLADE_HOOKUP_OBJECT (winMain, image501, "image501"); + 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/meta/recipes-tbd/xournal/xournal_0.2.bb b/meta/recipes-tbd/xournal/xournal_0.2.bb new file mode 100644 index 0000000000..1ca6e1ed7c --- /dev/null +++ b/meta/recipes-tbd/xournal/xournal_0.2.bb @@ -0,0 +1,12 @@ +HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/" +DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." +DEPENDS = "gtk+ libgnomecanvas zlib" +SECTION = "x11" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "http://math.mit.edu/~auroux/software/xournal/xournal-0.2.tar.gz \ + file://ldflags.patch;patch=1 \ + file://no-printing.diff;patch=1" + +inherit autotools pkgconfig -- cgit 1.2.3-korg