MirPorts can do better than Debian, apparently… move to .h file
authormirabilos <tg@debian.org>
Tue, 2 Jul 2019 20:48:38 +0000 (22:48 +0200)
committermirabilos <mirabilos@evolvis.org>
Tue, 2 Jul 2019 20:48:38 +0000 (22:48 +0200)
debian/changelog
debian/patches/debian-specific/version-dialogue.diff
debian/patches/experiments/revert-restriking-patch.diff
debian/patches/upstream/better-batch-convert.diff
debian/rules

index dec7262..621970b 100644 (file)
@@ -3,7 +3,7 @@ musescore2 (2.3.2+dfsg3-3) wtf; urgency=high
   * Merge musescore (2.3.2+dfsg2-7) unstable; urgency=high
   * Display distro packaging versioning in About, --long-version
 
- -- Thorsten Glaser <tg@mirbsd.de>  Tue, 02 Jul 2019 22:26:33 +0200
+ -- Thorsten Glaser <tg@mirbsd.de>  Tue, 02 Jul 2019 22:48:28 +0200
 
 musescore2 (2.3.2+dfsg3-2) wtf; urgency=medium
 
index 0d0867a..a93133c 100644 (file)
@@ -5,18 +5,19 @@ Justification: Debian-specific change
 
 --- a/mscore/musescore.cpp
 +++ b/mscore/musescore.cpp
-@@ -128,6 +128,10 @@ extern Ms::Synthesizer* createAeolus();
- extern Ms::Synthesizer* createZerberus();
+@@ -121,6 +121,11 @@
+ #include "macos/cocoabridge.h"
  #endif
  
++#include "DEB_PKG_VERSION.h"
 +#ifndef DEB_PKG_VERSION
 +#define DEB_PKG_VERSION VERSION
 +#endif
 +
- namespace Ms {
- MuseScore* mscore;
-@@ -265,9 +269,9 @@ static void printVersion(const char* pro
+ #ifdef AEOLUS
+ extern Ms::Synthesizer* createAeolus();
+ #endif
+@@ -265,9 +270,9 @@ static void printVersion(const char* pro
        {
        if (MuseScore::unstable())
              fprintf(stderr, "%s: Music Score Editor\nUnstable Prerelease for Version %s; Build %s\n",
@@ -28,7 +29,7 @@ Justification: Debian-specific change
        }
  
  static const int RECENT_LIST_SIZE = 20;
-@@ -3551,9 +3555,9 @@ AboutBoxDialog::AboutBoxDialog()
+@@ -3551,9 +3556,9 @@ AboutBoxDialog::AboutBoxDialog()
              ":/data/musescore-logo-transbg-m.png" : ":/data/musescore_logo_full.png"));
  
        if (MuseScore::unstable())
@@ -40,7 +41,7 @@ Justification: Debian-specific change
        revisionLabel->setText(tr("Revision: %1").arg(revision));
        setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
  
-@@ -3586,7 +3590,7 @@ void AboutBoxDialog::copyRevisionToClipb
+@@ -3586,7 +3591,7 @@ void AboutBoxDialog::copyRevisionToClipb
        // endianess?
        sysinfo += ", MuseScore version (";
        sysinfo += QSysInfo::WordSize==32?"32":"64";
index ceaa291..6395677 100644 (file)
@@ -97,7 +97,7 @@ Forwarded: https://github.com/musescore/MuseScore/pull/3797
                                if (port != eventPort || channel != eventChannel)
 --- a/mscore/musescore.cpp
 +++ b/mscore/musescore.cpp
-@@ -5661,36 +5661,14 @@ bool MuseScore::saveMp3(Score* score, co
+@@ -5662,36 +5662,14 @@ bool MuseScore::saveMp3(Score* score, co
                                playTime  += n;
                                frames    -= n;
                                }
index d391c87..d9cc570 100644 (file)
@@ -20,7 +20,7 @@ Applied-Upstream: master, commit:66dba74
  //    if "ask" is true, ask to ignore; returns true if
 --- a/mscore/musescore.cpp
 +++ b/mscore/musescore.cpp
-@@ -2532,161 +2532,186 @@ static void loadScores(const QStringList
+@@ -2533,161 +2533,186 @@ static void loadScores(const QStringList
  //   doConvert
  //---------------------------------------------------------
  
@@ -314,7 +314,7 @@ Applied-Upstream: master, commit:66dba74
        }
  
  //---------------------------------------------------------
-@@ -2714,7 +2739,7 @@ static bool doProcessJob(QString jsonFil
+@@ -2715,7 +2740,7 @@ static bool doProcessJob(QString jsonFil
        QJsonArray a = doc.array();
        for (const auto i : a) {
              QString inFile;
@@ -323,7 +323,7 @@ Applied-Upstream: master, commit:66dba74
              QString plugin;
              if (!i.isObject()) {
                    fprintf(stderr, "array value is not an object\n");
-@@ -2722,19 +2747,22 @@ static bool doProcessJob(QString jsonFil
+@@ -2723,19 +2748,22 @@ static bool doProcessJob(QString jsonFil
                    }
              QJsonObject obj = i.toObject();
              for (const auto& key : obj.keys()) {
index 4b7ef11..3dd58db 100755 (executable)
@@ -17,12 +17,6 @@ OUR_CFLAGS:=
 OUR_CXXFLAGS:=
 OUR_LDFLAGS:=  -Wl,--as-needed
 
-# better version information in the About dialogue
-VERSTRING_VSN:=$(strip $(shell dpkg-parsechangelog -S Version))
-VERSTRING_VND:=$(strip $(shell lsb_release -si))
-VERSTRING_REL:=$(strip $(shell lsb_release -sc))
-OUR_CPPFLAGS+= -DDEB_PKG_VERSION=\"${VERSTRING_VSN} (${VERSTRING_VND} ${VERSTRING_REL}/${DEB_HOST_ARCH})\"
-
 # defined for most of the code anyway; doing this here helps the PCH
 OUR_CPPFLAGS+= -DQT_NO_DEBUG
 # avoid stray debugging output
@@ -36,6 +30,9 @@ OUR_CFLAGS+=  -Og
 OUR_CXXFLAGS+= -Og
 endif
 
+# things that cannot be passed via CPPFLAGS
+OUR_CPPFLAGS+= -I$(shell pwd)/debian/q-include
+
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 export DEB_CPPFLAGS_MAINT_APPEND := ${OUR_CPPFLAGS}
 export DEB_CFLAGS_MAINT_APPEND := ${OUR_CFLAGS}
@@ -58,6 +55,14 @@ endif
 CMAKE_DEFS+=   -DBUILD_WEBKIT=OFF
 
 override_dh_auto_configure:
+       rm -rf debian/q-include
+       mkdir debian/q-include
+       printf '#define DEB_PKG_VERSION "%s (%s %s/%s)"\n' \
+           "$$(dpkg-parsechangelog -S Version)" \
+           "$$(lsb_release -si)" \
+           "$$(lsb_release -sc)" \
+           "${DEB_HOST_ARCH}" \
+           >debian/q-include/DEB_PKG_VERSION.h
        exec dh_auto_configure -- ${CMAKE_DEFS}
 
 override_dh_auto_build:
@@ -74,3 +79,7 @@ override_dh_install-indep:
        cd debian/musescore-common/usr/share/mscore-* && \
            mkdir -p sound && \
            ln -sf ../../sounds/sf2 ../../sounds/sf3 ../../sounds/sfz sound/
+
+override_dh_auto_clean:
+       rm -rf debian/q-include
+       exec dh_auto_clean