diff options
Diffstat (limited to 'misc/auto-multiple-choice/files')
| -rw-r--r-- | misc/auto-multiple-choice/files/patch-Makefile | 65 | ||||
| -rw-r--r-- | misc/auto-multiple-choice/files/patch-Makefile.conf | 94 |
2 files changed, 0 insertions, 159 deletions
diff --git a/misc/auto-multiple-choice/files/patch-Makefile b/misc/auto-multiple-choice/files/patch-Makefile deleted file mode 100644 index 9fd80af1cc65..000000000000 --- a/misc/auto-multiple-choice/files/patch-Makefile +++ /dev/null @@ -1,65 +0,0 @@ ---- Makefile.orig 2016-03-16 08:18:02 UTC -+++ Makefile -@@ -43,7 +43,7 @@ CXXFLAGS ?= -O2 - # try to find right names for OpenCV libs - - ifeq ($(GCC_OPENCV_LIBS),auto) --ifeq ($(shell echo 'int main(){}' | gcc -xc -lopencv_core - && ( rm -f a.out ; echo "OK")),OK) -+ifeq ($(shell echo 'int main(){}' | $(CC) -xc $(LDFLAGS) -lopencv_core - && ( rm -f a.out ; echo "OK")),OK) - GCC_OPENCV_LIBS:=-lopencv_core -lopencv_highgui -lopencv_imgproc - else - GCC_OPENCV_LIBS:=-lcv -lhighgui -lcxcore -@@ -210,13 +210,13 @@ endif - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MODSDIR)/perl - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MODSDIR)/exec - install -m 0755 $(USER_GROUP) $(MODS) $(DESTDIR)/$(MODSDIR)/perl -- install -m 0755 $(USER_GROUP) $(BINARIES) $(DESTDIR)/$(MODSDIR)/exec -+ install -s -m 0755 $(USER_GROUP) $(BINARIES) $(DESTDIR)/$(MODSDIR)/exec - install -m 0644 $(USER_GROUP) $(GLADE) $(DESTDIR)/$(MODSDIR)/perl - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(TEXDIR) - install -m 0644 $(USER_GROUP) $(STY) $(DESTDIR)/$(TEXDIR) - ifneq ($(DESKTOPDIR),) - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(DESKTOPDIR) -- install -m 0644 $(USER_GROUP) -T auto-multiple-choice.desktop $(DESTDIR)/$(DESKTOPDIR)/auto-multiple-choice.desktop -+ install -m 0644 $(USER_GROUP) auto-multiple-choice.desktop $(DESTDIR)/$(DESKTOPDIR)/auto-multiple-choice.desktop - endif - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(BINDIR) - install -m 0755 $(USER_GROUP) auto-multiple-choice $(DESTDIR)/$(BINDIR) -@@ -224,7 +224,7 @@ endif - install -m 0644 $(USER_GROUP) icons/*.svg $(DESTDIR)/$(ICONSDIR) - ifneq ($(PIXDIR),) - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PIXDIR) -- install -m 0644 $(USER_GROUP) -T $(MAIN_LOGO).xpm $(DESTDIR)/$(PIXDIR)/auto-multiple-choice.xpm -+ install -m 0644 $(USER_GROUP) $(MAIN_LOGO).xpm $(DESTDIR)/$(PIXDIR)/auto-multiple-choice.xpm - endif - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PERLDIR)/AMC - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PERLDIR)/AMC/Export -@@ -253,6 +253,7 @@ endif - ifneq ($(SYSTEM_TYPE),deb) # with debian, done with dh_install{doc,man} - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(DOCDIR) - install -m 0644 $(USER_GROUP) $(wildcard doc/auto-multiple-choice.??.xml doc/auto-multiple-choice.??.pdf) $(DESTDIR)/$(DOCDIR) -+ rm -f doc/html/images/callouts/.hgempty - cp -r doc/html $(DESTDIR)/$(DOCDIR) - ifeq ($(INSTALL_USER),) - else -@@ -263,7 +264,19 @@ else - chgrp -hR $(INSTALL_GROUP) $(DESTDIR)/$(DOCDIR) - endif - install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MAN1DIR) -- install -m 0644 $(USER_GROUP) doc/*.1 $(DESTDIR)/$(MAN1DIR) -+ for f in doc/AMC-*.1; do \ -+ case $$f in \ -+ *.??.1) ;; \ -+ *) install -m 0644 $(USER_GROUP) $$f $(DESTDIR)/$(MAN1DIR) ;; \ -+ esac; \ -+ done -+ install -m 0644 $(USER_GROUP) doc/auto-multiple-choice.1 $(DESTDIR)/$(MAN1DIR) -+ mkdir -p $(DESTDIR)/$(FRMAN1DIR) -+ install -m 0644 $(USER_GROUP) doc/auto-multiple-choice.fr.1 $(DESTDIR)/$(FRMAN1DIR)/auto-multiple-choice.1 -+ mkdir -p $(DESTDIR)/$(JAMAN1DIR) -+ for f in doc/*.ja.1; do \ -+ iconv -f UTF-8 -t EUC-JP < $$f > $(DESTDIR)/$(JAMAN1DIR)/`expr $$f : 'doc/\(.*\).ja.1'`.1; \ -+ done - endif - - install: install_nodoc install_doc ; diff --git a/misc/auto-multiple-choice/files/patch-Makefile.conf b/misc/auto-multiple-choice/files/patch-Makefile.conf deleted file mode 100644 index 80a6600b98e9..000000000000 --- a/misc/auto-multiple-choice/files/patch-Makefile.conf +++ /dev/null @@ -1,94 +0,0 @@ ---- Makefile.conf.orig 2016-03-09 19:17:01 UTC -+++ Makefile.conf -@@ -28,47 +28,55 @@ SYSTEM_TYPE ?= debian - - LATEX_FREE=0 - -+GCC=$(CC) -+GCC_PP=$(CXX) -+CFLAGS = -O2 -I%%LOCALBASE%%/include -I. -DNEEDS_GETLINE -+CXXFLAGS = -O2 -I%%LOCALBASE%%/include -I. -DNEEDS_GETLINE -+LDFLAGS += -L%%LOCALBASE%%/lib -+ - # INSTALLATION : where to install parts of the package ? - - # directory for executable --BINDIR=/usr/bin -+BINDIR=%%PREFIX%%/bin - # directory for perl modules --PERLDIR=/usr/share/perl5 -+PERLDIR=%%PREFIX%%/%%SITE_PERL_REL%% - # directory for some AMC executables, not to be used by end-user --MODSDIR=/usr/lib/AMC -+MODSDIR=%%PREFIX%%/lib/AMC - # directory for LaTeX style file --TEXDIR=/usr/share/texmf/tex/latex/AMC -+TEXDIR=%%PREFIX%%/%%TEXMFLOCALDIR%%/tex/latex/AMC - # directory for LaTeX doc --TEXDOCDIR=/usr/share/doc/texmf/AMC/ -+TEXDOCDIR=%%PREFIX%%/%%TEXMFLOCALDIR%%/doc/latex/AMC/ - # directory for man (1) files --MAN1DIR=/usr/share/man/man1 -+MAN1DIR=%%MANPREFIX%%/man/man1 -+FRMAN1DIR=%%MANPREFIX%%/man/fr/man1 -+JAMAN1DIR=%%MANPREFIX%%/man/ja/man1 - # directory for desktop file --DESKTOPDIR=/usr/share/applications -+DESKTOPDIR=%%PREFIX%%/share/applications - # directory for icons (svg) --ICONSDIR=/usr/share/auto-multiple-choice/icons -+ICONSDIR=%%DATADIR%%/icons - # directory for icons (xpm) --PIXDIR=/usr/share/pixmaps -+PIXDIR=%%PREFIX%%/share/pixmaps - # directory for locales (MO files will be put in - # $(LOCALEDIR)/fr/LC_MESSAGES for example) --LOCALEDIR=/usr/share/locale -+LOCALEDIR=%%PREFIX%%/share/locale - # directory for AMC packaged models --MODELSDIR=/usr/share/auto-multiple-choice/models -+MODELSDIR=%%DATADIR%%/models - # directory for documentation (will use html/auto-multiple-choice.* subdirs for HTML docs) --DOCDIR=/usr/share/doc/auto-multiple-choice-doc -+DOCDIR=%%DOCSDIR%% - - # directory for Shared MIME-info Database --SHARED_MIMEINFO_DIR=/usr/share/mime/packages -+SHARED_MIMEINFO_DIR=%%SHARED_MIMEINFO_DIR%% - # directory for gtksourceview/gedit languages highlighting syntax --LANG_GTKSOURCEVIEW_DIR=/usr/share/gtksourceview-3.0/language-specs -+LANG_GTKSOURCEVIEW_DIR=%%LANG_GTKSOURCEVIEW_DIR%% - - # BUILD : where to find some files used for building AMC ? - # URLs can be used if XML catalogs are present. - --#DOCBOOK_MAN_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl -+#DOCBOOK_MAN_XSL=%%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl - DOCBOOK_MAN_XSL=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl --#DOCBOOK_XHTML_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl -+#DOCBOOK_XHTML_XSL=%%LOCALBASE%%/share/xsl/docbook/xhtml/chunk.xsl - DOCBOOK_XHTML_XSL=http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl --#DOCBOOK_DTD=/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd -+#DOCBOOK_DTD=%%LOCALBASE%%/share/xml/docbook/4.5/docbookx.dtd - DOCBOOK_DTD=http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd - - # BUILD : options to compile with netpbm / opencv libraries -@@ -83,7 +91,7 @@ DESKTOP_CAT=Education; - # these arguments are not available with tar: use an empty - # TAR_REPRODUCIBLE_ARGS - --TAR_REPRODUCIBLE_ARGS=--owner=root --group=root --numeric-owner --mtime=@1451602800 -+TAR_REPRODUCIBLE_ARGS=--owner=root --group=wheel --numeric-owner --mtime=@1451602800 - - # same for gzip - -@@ -92,7 +100,7 @@ GZIP_REPRODUCIBLE_ARGS=-n - # INSTALL USER AND GROUP - - ifneq ($(SYSTEM_TYPE),rpm) --INSTALL_USER=root --INSTALL_GROUP=root -+INSTALL_USER= -+INSTALL_GROUP= - endif - |