[patch] patch of the 1.4.0 ebuild

auto-multiple-choice-1.4.0.patch (text/plain), 3.11 KB, created by sylvain.miossec on 2020-11-12 10:44:12 UTC

diff -ruN auto-multiple-choice-1.4.0.orig/Makefile.conf auto-multiple-choice-1.4.0/Makefile.conf
--- auto-multiple-choice-1.4.0.orig/Makefile.conf	2020-11-11 15:54:03.617343577 +0100
+++ auto-multiple-choice-1.4.0/Makefile.conf	2020-11-11 21:16:17.737817213 +0100
@@ -33,13 +33,13 @@
 # directory for executable
 BINDIR=/usr/bin
 # directory for perl modules
-PERLDIR=/usr/share/perl5
+PERLDIR=$(VENDOR_LIB)
 # directory for some AMC executables, not to be used by end-user
 MODSDIR=/usr/lib/AMC
 # directory for LaTeX style file
-TEXDIR=/usr/share/texmf/tex/latex/AMC
+TEXDIR=/usr/share/texmf-site/tex/latex/AMC
 # directory for LaTeX doc
-TEXDOCDIR=/usr/share/doc/texmf/AMC/
+TEXDOCDIR=/usr/share/texmf-site/doc/AMC/
 # directory for man (1) files
 MAN1DIR=/usr/share/man/man1
 # directory for desktop file 
@@ -58,7 +58,7 @@
 # directory for AMC packaged models
 MODELSDIR=/usr/share/auto-multiple-choice/models
 # directory for documentation (will use html/auto-multiple-choice.* subdirs for HTML docs)
-DOCDIR=/usr/share/doc/auto-multiple-choice
+DOCDIR=/usr/share/doc/$(PVR)
 
 # directory for Shared MIME-info Database
 SHARED_MIMEINFO_DIR=/usr/share/mime/packages
@@ -79,6 +79,9 @@
 
 GCC_NETPBM=-lnetpbm
 
+GCC_OPENCV = -I/usr/include/opencv4
+GCC_OPENCV_LIBS = -lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_imgcodecs
+
 # INFO IN DESKTOP FILE
 
 DESKTOP_CAT=Education;
@@ -95,8 +98,8 @@
 
 # INSTALL USER AND GROUP
 
-ifneq ($(SYSTEM_TYPE),rpm)
-INSTALL_USER=root
-INSTALL_GROUP=root
-endif
+#ifneq ($(SYSTEM_TYPE),rpm)
+#INSTALL_USER=root
+#INSTALL_GROUP=root
+#endif
 
diff -ruN auto-multiple-choice-1.4.0.orig/auto-multiple-choice.desktop.in auto-multiple-choice-1.4.0/auto-multiple-choice.desktop.in
--- auto-multiple-choice-1.4.0.orig/auto-multiple-choice.desktop.in	2020-11-11 15:54:03.618343561 +0100
+++ auto-multiple-choice-1.4.0/auto-multiple-choice.desktop.in	2020-11-11 16:01:54.150588085 +0100
@@ -10,5 +10,5 @@
 GenericName[fr]=QCM automatique
 Comment=Manage multiple choice questionnaires, with automatic marking from papers' scans
 Comment[fr]=Conception et correction automatique de QCM en LaTeX
-Keywords=multiple;choice;questionnaire;exam;grading;marking;MCQ;AMC
-Keywords[fr]=questionnaire;choix;multiple;examen;correction;QCM;AMC
+Keywords=multiple;choice;questionnaire;exam;grading;marking;MCQ;AMC;
+Keywords[fr]=questionnaire;choix;multiple;examen;correction;QCM;AMC;
diff -ruN auto-multiple-choice-1.4.0.orig/pdfformfields.c auto-multiple-choice-1.4.0/pdfformfields.c
--- auto-multiple-choice-1.4.0.orig/pdfformfields.c	2020-11-11 15:54:03.618343561 +0100
+++ auto-multiple-choice-1.4.0/pdfformfields.c	2020-11-11 21:24:07.071827119 +0100
@@ -125,7 +125,7 @@
         for (int i=0; i<g_list_length(list); i++) {
             if (i > 0) printf("---\n");
 
-            PopplerFormFieldMapping *f = g_list_nth_data(list, i);
+            PopplerFormFieldMapping *f = (PopplerFormFieldMapping *)g_list_nth_data(list, i);
             // printf("field found, id: %d, name: %s\n",poppler_form_field_get_id(f->field),poppler_form_field_get_name(f->field));
             PopplerFormFieldType type = poppler_form_field_get_field_type(f->field);