[Octave-patch-tracker] [patch #9440] Add Flatpak build manifest

[Mike Miller]

Follow-up Comment #49, patch #9440 (project octave):

I'm able to build qscintilla with the following change


@@ -342,21 +342,25 @@
     },
     {
       "name": "qscintilla",
-      "buildsystem": "simple",
+      "no-autogen": true,
       "sources": [
         {
           "type": "archive",
           "url":
"https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.10/QScintilla_gpl-2.10.tar.gz";,
           "sha256":
"16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec"
+        },
+        {
+          "type": "shell",
+          "commands": [
+            "sed -e 's|\\(target.path\\) = .*|\\1 = /app/lib|' -i
Qt4Qt5/qscintilla.pro",
+            "sed -e 's|\\(header.path\\) = .*|\\1 = /app/include|' -i
Qt4Qt5/qscintilla.pro",
+            "sed -e 's|\\(trans.path\\) = .*|\\1 =
/app/share/qt5/translations|' -i Qt4Qt5/qscintilla.pro",
+            "sed -e 's|\\(qsci.path\\) = .*|\\1 = /app/share/qt5|' -i
Qt4Qt5/qscintilla.pro",
+            "sed -e 's|\\(features.path\\) = .*|\\1 =
/app/lib/qt5/mkspecs/features|' -i Qt4Qt5/qscintilla.pro",
+            "cd Qt4Qt5 && qmake",
+            "printf 'all:\\n\\t$(MAKE) -C Qt4Qt5 address@hidden:\\n\\t$(MAKE) 
-C
Qt4Qt5 address@hidden' > Makefile"
+          ]
         }
-      ],
-      "build-commands": [
-        "sed -e 's|\\(target.path\\) = .*|\\1 = /app/lib|' -i
Qt4Qt5/qscintilla.pro",
-        "sed -e 's|\\(header.path\\) = .*|\\1 = /app/include|' -i
Qt4Qt5/qscintilla.pro",
-        "sed -e 's|\\(trans.path\\) = .*|\\1 = /app/share/qt5/translations|'
-i Qt4Qt5/qscintilla.pro",
-        "sed -e 's|\\(qsci.path\\) = .*|\\1 = /app/share/qt5|' -i
Qt4Qt5/qscintilla.pro",
-        "sed -e 's|\\(features.path\\) = .*|\\1 =
/app/lib/qt5/mkspecs/features|' -i Qt4Qt5/qscintilla.pro",
-        "cd Qt4Qt5 && qmake && make install"
       ]
     },
     {


This treats the sed and qmake commands like a sort of bootstrap, and then
creates a shim Makefile at the top-level to let the normal "make" and "make
install" commands work. This allows it to succeed for me with Flatpak 0.8.7.

    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/patch/?9440>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/