[Git][debian-gis-team/opencpn][master] 5 commits: build: Update for new debian deps.

[Alec leamas]

Alec leamas pushed to branch master at Debian GIS Project / opencpn


Commits:
c7d92561 by Alec Leamas at 2019-12-02T17:56:58Z
build: Update for new debian deps.

- - - - -
a7ad12f1 by Alec Leamas at 2019-12-04T19:34:15Z
debian: Move to gtk3.

- - - - -
3e7f419b by Alec Leamas at 2019-12-04T19:58:35Z
Add fix for broken CMakelists FIND_WXWIDGETS.

- - - - -
6a0fe4be by Alec Leamas at 2019-12-04T20:13:31Z
debian: Updating changelog after move to gtk3.

- - - - -
585a1cd5 by Alec Leamas at 2019-12-08T00:20:06Z
Add a linux NDEBUG compile flag (#1500).

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/patches/0005-CMakelists-move-appdata.xml-to-usr-share-metainfo.patch
- + debian/patches/0006-CMakelists-Fix-broken-FIND_WXWIDGETS-invocation.patch
- + debian/patches/0007-Add-a-linux-NDEBUG-compile-flag-1500.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
 opencpn (5.0.0+dfsg.1-1) unstable; urgency=medium
 
   * New upstream release
-  * Drop all patches besides 2 after being upstreamed
+  * Move to gtk3
+  * Drop all patches besides two after being upstreamed
   * Drop some lintian overrides after upstream fixes.
   * Add a patch for broken include paths.
+  * Add a patch for broken FIND_WXWIDGETS in CMakeLists
+  * Disable assertion messages using the standard NDEBUG flag.
   * Move appstream data to new location, relicense
     and clean up rules.
   * Bump Standards-Version to 4.4.1, no changes.


=====================================
debian/control
=====================================
@@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 12),
  libsqlite3-dev,
  libtinyxml-dev,
  libunarr-dev,
- libwxgtk3.0-dev,
- libwxsvg-dev,
+ libwxsvg-dev (>=  2:1.5.21),
+ libwxgtk3.0-gtk3-dev,
  portaudio19-dev
 Standards-Version: 4.4.1
 Homepage: https://opencpn.org


=====================================
debian/patches/0005-CMakelists-move-appdata.xml-to-usr-share-metainfo.patch
=====================================
@@ -3,7 +3,6 @@ Date: Wed, 20 Nov 2019 15:47:38 -0500
 Subject: CMakelists: move appdata.xml to /usr/share/metainfo
 
 Bug: https://github.com/OpenCPN/OpenCPN/issues/1490
-
 ---
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)


=====================================
debian/patches/0006-CMakelists-Fix-broken-FIND_WXWIDGETS-invocation.patch
=====================================
@@ -0,0 +1,31 @@
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Wed, 4 Dec 2019 14:56:00 -0500
+Subject: CMakelists: Fix broken FIND_WXWIDGETS invocation
+
+This is already fixed in upstream. This patch is simplified
+and thus cannot be upstreamed.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06198ef..f34e138 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+     set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
+     MESSAGE(STATUS "Building against GTK3...")
+   ENDIF(GTK2_FOUND)
+-  FIND_PACKAGE(wxWidgets)
++  FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_USE_LIBS})
+   if (wxWidgets_FOUND)
+     message(STATUS "Found wxWidgets webview add-on")
+     add_definitions(-DOCPN_USE_WEBVIEW)
+   else ()
+     list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
+     message(STATUS "Could not find wxWidgets webview add-on")
+-    FIND_PACKAGE(wxWidgets REQUIRED)
++    FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_USE_LIBS} REQUIRED)
+   endif ()
+   MESSAGE (STATUS "Found wxWidgets..." )
+   MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}")


=====================================
debian/patches/0007-Add-a-linux-NDEBUG-compile-flag-1500.patch
=====================================
@@ -0,0 +1,20 @@
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Sun, 8 Dec 2019 01:05:49 +0100
+Subject: Add a linux NDEBUG compile flag (#1500).
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f34e138..2a9029a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2085,6 +2085,7 @@ IF(WIN32)
+   target_sources(${PACKAGE_NAME} PRIVATE app.manifest)
+ ENDIF(WIN32)
+ 
++ADD_DEFINITIONS( "-DNDEBUG" )
+ 
+ IF(APPLE)
+ 


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@
 0003-build-Handle-missing-doc-files.patch
 0004-appstream-Relicense-metadata-to-overall-GPL-2-packag.patch
 0005-CMakelists-move-appdata.xml-to-usr-share-metainfo.patch
+0006-CMakelists-Fix-broken-FIND_WXWIDGETS-invocation.patch
+0007-Add-a-linux-NDEBUG-compile-flag-1500.patch


=====================================
debian/rules
=====================================
@@ -18,7 +18,7 @@ override_dh_auto_configure:
             -DBUILD_SHARED_LIBS=OFF \
             -DUSE_BUNDLED_LIBS=OFF \
             -DOCPN_NEW_SERIAL=OFF \
-            -DWX_CONFIG_OPTIONS=--toolkit=gtk2
+            -DOCPN_FORCE_GTK3=ON
 
 override_dh_auto_install:
 	dh_auto_install



View it on GitLab: https://salsa.debian.org/debian-gis-team/opencpn/compare/95ff37a6f4847a04cb56a2694a922827d2e6d029...585a1cd55f55cb11329a84dabb91339e3cd456a9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/opencpn/compare/95ff37a6f4847a04cb56a2694a922827d2e6d029...585a1cd55f55cb11329a84dabb91339e3cd456a9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191208/894006a7/attachment-0001.html>