From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/oregano-0.69.1-desktop_file_update.patch | 26 ++++++++++++++++ .../oregano/files/oregano-0.69.1-fix-libm.patch | 11 +++++++ .../files/oregano-0.69.1-scons_env_flags.patch | 27 +++++++++++++++++ .../oregano/files/oregano-0.82-asneeded.patch | 22 ++++++++++++++ .../oregano/files/oregano-0.82-automake.patch | 25 ++++++++++++++++ .../files/oregano-0.82-format-security.patch | 35 ++++++++++++++++++++++ .../files/oregano-0.82-remove.unneeded.docs.patch | 13 ++++++++ 7 files changed, 159 insertions(+) create mode 100644 sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch create mode 100644 sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch create mode 100644 sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch create mode 100644 sci-electronics/oregano/files/oregano-0.82-asneeded.patch create mode 100644 sci-electronics/oregano/files/oregano-0.82-automake.patch create mode 100644 sci-electronics/oregano/files/oregano-0.82-format-security.patch create mode 100644 sci-electronics/oregano/files/oregano-0.82-remove.unneeded.docs.patch (limited to 'sci-electronics/oregano/files') diff --git a/sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch b/sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch new file mode 100644 index 000000000000..5d3b2ef6d35a --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## desktop.file.update.dpatch by Maximiliano Curia +## +## DP: Update categories and name of desktop file + +@DPATCH@ +diff -urNad oregano-0.69.1~/oregano.desktop oregano-0.69.1/oregano.desktop +--- oregano-0.69.1~/oregano.desktop 2009-07-07 12:49:49.000000000 -0300 ++++ oregano-0.69.1/oregano.desktop 2009-07-22 20:41:53.209525839 -0300 +@@ -1,8 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=Oregano electrical engineering tool +-Name[ca]=Eina d'enginyeria elèctrica Oregano +-Name[es]=Oregano, herramienta para la ingeniería electrónica ++Name=Oregano + GenericName=Electrical engineering tool + GenericName[ca]=Eina d'enginyeria elèctrica + GenericName[es]=Herramienta para la ingeniería electrónica +@@ -17,5 +15,5 @@ + StartupNotify=true + Terminal=false + Type=Application +-Categories=GNOME;GTK;Science;Education;Physics; ++Categories=GNOME;GTK;Science;Education;Electronics; + MimeType=application/x-oregano; diff --git a/sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch b/sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch new file mode 100644 index 000000000000..420ffe17f00c --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch @@ -0,0 +1,11 @@ +--- src/SConscript.old 2009-07-07 19:49:49.000000000 +0400 ++++ src/SConscript 2014-11-12 20:57:50.311089881 +0300 +@@ -67,6 +67,8 @@ + + SrcEnv.Append (CCFLAGS = Split ("-I./src -I./src/model -I./src/sheet -I./src/gplot -I./data/dialogs -I./src/engines")) + ++SrcEnv.Append (LIBS = ['m']) ++ + oregano = SrcEnv.Program ('oregano', files) + + # Install alias # \ No newline at end of file diff --git a/sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch b/sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch new file mode 100644 index 000000000000..6e999e44e586 --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## scons.env.flags.dpatch by Maximiliano Curia +## +## DP: Honour the CFLAGS and LDFLAGS environment variables + +@DPATCH@ +diff -urNad oregano-0.69.1~/SConstruct oregano-0.69.1/SConstruct +--- oregano-0.69.1~/SConstruct 2009-07-07 12:49:49.000000000 -0300 ++++ oregano-0.69.1/SConstruct 2009-07-22 19:59:31.665525831 -0300 +@@ -76,9 +76,14 @@ + mo_bld = Builder (action = mo_builder) + + CEnv.Append (BUILDERS = {'MoBuild' : mo_bld}) +-CEnv.Append (CCFLAGS = Split ('-Wall')); +-if CEnv['Debug']: +- CEnv.Append (CCFLAGS = Split ('-g')); ++if ( os.environ.has_key('CFLAGS') ): ++ CEnv.Append (CCFLAGS = Split (os.environ['CFLAGS'])) ++else: ++ CEnv.Append (CCFLAGS = Split ('-Wall')) ++ if CEnv['Debug']: ++ CEnv.Append (CCFLAGS = Split ('-g')) ++if ( os.environ.has_key('LDFLAGS') ): ++ CEnv.Append (LINKFLAGS = Split (os.environ['LDFLAGS'])) + + # Check dependencies # + if not CEnv.GetOption ('clean'): diff --git a/sci-electronics/oregano/files/oregano-0.82-asneeded.patch b/sci-electronics/oregano/files/oregano-0.82-asneeded.patch new file mode 100644 index 000000000000..8432a918da65 --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.82-asneeded.patch @@ -0,0 +1,22 @@ +--- src/Makefile.am.orig 2012-12-06 09:58:37.000000000 +0100 ++++ src/Makefile.am 2012-12-06 10:00:03.000000000 +0100 +@@ -34,10 +34,11 @@ + + bin_PROGRAMS = oregano + +-OREGANO_LIBS += gplot/libgplot.a \ ++NEW_OREGANO_LIBS = gplot/libgplot.a \ + engines/libengines.a \ + model/libmodel.a \ +- sheet/libsheet.a ++ sheet/libsheet.a \ ++ $(OREGANO_LIBS) + + oregano_PIXMAPS = \ + plot.xpm \ +@@ -99,4 +100,4 @@ + oregano.h + + oregano_LDADD = \ +- $(OREGANO_LIBS) ++ $(NEW_OREGANO_LIBS) diff --git a/sci-electronics/oregano/files/oregano-0.82-automake.patch b/sci-electronics/oregano/files/oregano-0.82-automake.patch new file mode 100644 index 000000000000..84f1bfd0ab10 --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.82-automake.patch @@ -0,0 +1,25 @@ +# adapt to new automake 0.13.1 (bug #467708) +# switch to AC_CONFIG_HEADERS, correct AM_INIT_AUTOMAKE, quote text in +# AC_MSG_ERROR +--- configure.ac.old 2013-04-28 15:49:22.000000000 +0000 ++++ configure.ac 2013-04-28 15:50:25.000000000 +0000 +@@ -1,7 +1,7 @@ +-AC_INIT(AUTHORS) +-AM_INIT_AUTOMAKE(oregano, 0.81) ++AC_INIT(oregano,0.81,AUTHORS) ++AM_INIT_AUTOMAKE + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + + AC_CONFIG_MACRO_DIR([m4]) +@@ -38,7 +38,7 @@ + AC_SUBST(SCROLLKEEPER_REQUIRED) + AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) + if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) ++ AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package]) + fi + + diff --git a/sci-electronics/oregano/files/oregano-0.82-format-security.patch b/sci-electronics/oregano/files/oregano-0.82-format-security.patch new file mode 100644 index 000000000000..6242a1c71c14 --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.82-format-security.patch @@ -0,0 +1,35 @@ +From http://patch-tracker.debian.org/package/oregano/0.70-1 + +## Description: Avoid format-security errors +## Origin/Author: Maximiliano Curia +Index: oregano-0.70/src/dialogs.c +=================================================================== +--- oregano-0.70.orig/src/dialogs.c 2012-01-07 18:57:09.000000000 -0300 ++++ oregano-0.70/src/dialogs.c 2012-01-07 19:26:46.000000000 -0300 +@@ -61,7 +61,7 @@ + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, +- span_msg->str); ++ "%s", span_msg->str); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + +@@ -100,7 +100,7 @@ + GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, +- span_msg->str); ++ "%s", span_msg->str); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + +@@ -120,7 +120,7 @@ + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_OK, + GTK_BUTTONS_CANCEL, +- msg); ++ "%s", msg); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); + diff --git a/sci-electronics/oregano/files/oregano-0.82-remove.unneeded.docs.patch b/sci-electronics/oregano/files/oregano-0.82-remove.unneeded.docs.patch new file mode 100644 index 000000000000..df0d930dee23 --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.82-remove.unneeded.docs.patch @@ -0,0 +1,13 @@ +--- oregano-0.82/Makefile.am ++++ oregano-0.82/Makefile.am +@@ -7,10 +7,8 @@ + oreganodocdir = $(datadir)/doc/oregano + oreganodoc_DATA = \ + README\ +- COPYING\ + AUTHORS\ + ChangeLog\ +- INSTALL\ + NEWS\ + TODO + -- cgit v1.2.3