octave-patch-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Mike Miller
Subject: [Octave-patch-tracker] [patch #9440] Add Flatpak build manifest
Date: Tue, 19 Sep 2017 18:31:04 -0400 (EDT)
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:55.0) Gecko/20100101 Firefox/55.0

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

Your latest revision still gives me some small problems. I am able to build
with Flatpak 0.9.11 with the following changes (annotations below each diff
change)


@@ -176,7 +176,7 @@
       "sources": [
         {
           "type": "archive",
-          "path":
"https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-1.8.19.tar.bz2";,
+          "url":
"https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-1.8.19.tar.bz2";,


* This just looks like a typo, should be "url" instead of "path".


           "sha256":
"59c03816105d57990329537ad1049ba22c2b8afe1890085f0c022b75f1727238"
         }
       ]
@@ -333,15 +333,15 @@
           "type": "archive",
           "url":
"https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.10/QScintilla_gpl-2.10.tar.gz";,
           "sha256":
"16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec"
-        },
-        {
-          "type": "patch",
-          "path": "qscintilla.patch"


* I still want to avoid external patch files if at all possible, and the tiny
changes made in this patch can be done easily with sed, see below


         }
       ],
       "build-commands": [
-        "cd Qt4Qt5 && qmake && make install",
-        "ln -s /app/lib/libqscintilla2_qt5.so
/app/lib/libqscintilla2-qt5.so"



* No need to link an alias for the library here, Octave finds it under its
original name on the default branch


+        "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"


* Inline substitutions on qscintilla.pro to replace the external patch file


       ]
     },
     {


I also don't like that we are relying on an external file for the glu module.
If you want that to be an external module when it is merged into flathub,
that's fine, but I would rather have the entire file be standalone within
Octave's original copy of the manifest.

Able to build with Flatpak 0.9.11, testing with Flatpak 0.8.7 next. I had
thought that buildsystem==simple would not work at all with stable, I think
that's the problem I had before when I was using 0.8.7, I'll post again when I
get that far.

    _______________________________________________________

Reply to this item at:

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

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]