Skip to content
Commits on Source (8)
......@@ -14,15 +14,6 @@ with bakefiles available the complete build sequence is:
$ make ...
$ sudo make install
While the package does have a watch file, uscan(1) cannot be used to
download the source tarball due to the tar bug described in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831870. As a
workaround the package implements the traditional get-orig-source target,
usually invoked as 'make -f debian/rules get-orig-source' which creates
the orig tarball in the parent directory.
-- Alec Leamas <leamas.alec@gmail.com> Tue, 21 Aug 2018 15:06:16 +0200
wxcurl (1.0+ds-1) unstable; urgency=medium
wxcurl (1.0+dfsg.1-1) unstable; urgency=medium
* Initial release (Closes: #907071)
......
......@@ -12,22 +12,27 @@ Files-Excluded: build/osx/*
Files: *
Copyright: 2004 Casey O'Donnell. All rights reserved
(c) 2007 Francesco Montorsi
2007 Francesco Montorsi
License: wxWidgets
Files: build/config.guess
build/config.sub
Copyright: 1992-2005, Free Software Foundation, Inc.
License: GPL-2+
Files: configure
Copyright: 1992-1996, 1998-2006, Free Software Foundation, Inc.
Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
License: FSFUL
Files: debian/*
Copyright: 2018 Alec Leamas
Copyright: 2018, Alec Leamas
License: wxWidgets
Files: samples/dialogs/*
Copyright: Francesco Montorsi
License: wxWidgets
License: FSFUL
Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
.
This configure script is free software; the Free Software Foundation gives unlimited
permission to copy, distribute and modify it.
License: wxWidgets
wxWindows Library License, Version 3.1
Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al
......@@ -75,20 +80,3 @@ License: wxWidgets
to permit this exception to apply to your modifications. If you do not wish that,
you must delete the exception notice from such code and/or adjust the licensing '
conditions notice accordingly.
License: GPL-2+
This file is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
License: FSFUL
Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
.
This configure script is free software; the Free Software Foundation gives unlimited
permission to copy, distribute and modify it.
......@@ -10,7 +10,7 @@ debian-branch = master
# gbp import-orig uses the following names for the upstream tags.
# Change the value if you are not using gbp import-orig
upstream-tag = upstream/%(version)
upstream-tag = upstream/%(version)s
# Always use pristine-tar.
pristine-tar = True
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 25 Sep 2018 14:00:25 -0400
Subject: Makefile.in: Add target writing library -l definition.
Patching the generated .in file is far from ideal, but what can
be achieved given that we cannot rebuild it on Debian due to
missing bakefiles.
Adding code to write the correct library name based on existing
Makefile variables using the wxlib-version target
---
Makefile.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index 5da0eba..b6725ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -511,3 +511,6 @@ dialogs_minimal_rc.o: $(srcdir)/samples/dialogs/minimal.rc
uninstall_wxcurl_lib install_wxcurl_lib_headers \
uninstall_wxcurl_lib_headers install_wxcurl_dll uninstall_wxcurl_dll \
install_wxcurl_dll_headers uninstall_wxcurl_dll_headers
+
+wxlib-version:
+ @echo -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_wxcurl-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
......@@ -10,3 +10,4 @@
0010-base-Fix-undefined-behaviour-in-va_start.patch
0011-base-use-wxstring-return-values-instead-of-std-strin.patch
0012-Threads-corner-cases.patch
0013-Makefile.in-Add-target-writing-library-l-definition.patch
......@@ -2,14 +2,20 @@
include /usr/share/dpkg/pkg-info.mk
WX_LIB = -lwxcode_gtk2u_wxcurl-3.0
LDFLAGS += -Wl,--as-needed
export LDFLAGS
# Undefined until after build!
WX_LIB = $(shell make -s wxlib-version)
VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+dfsg.[0-9]//')
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@ --no-parallel
dh $@
override_dh_clean:
dh_clean
......@@ -19,7 +25,7 @@ override_dh_auto_build:
dh_auto_build
cd docs; doxygen
sed -e 's|@LIBDIR@|$(DEB_TARGET_MULTIARCH)|' \
-e 's|@VERSION@|$(DEB_VERSION_UPSTREAM)|' \
-e 's|@VERSION@|$(VERSION)|' \
-e 's|@LIB@|$(WX_LIB)|' \
< wxcurl.pc.in > wxcurl.pc
......@@ -27,23 +33,3 @@ override_dh_auto_install:
dh_auto_install
install -Dm 644 wxcurl.pc \
debian/tmp/usr/lib/$(DEB_TARGET_MULTIARCH)/pkgconfig/wxcurl.pc
# Work around what's seemingly a tar bug, see
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831870
VERSION = $(DEB_VERSION_UPSTREAM)
BASE_VERSION = $(word 1,$(subst +, ,$(VERSION)))
get-orig-source:
test -d utmp || mkdir utmp; rm -rf utmp/*
uscan --destdir=$(CURDIR)/utmp --force-download --safe
cd utmp; \
unzip -q -a wxcurl-$(BASE_VERSION).zip; \
mv wxcurl wxcurl-$(VERSION); \
dos2unix -q $$(find . -name \*.cpp -o -name \*.h) \
configure Makefile.in; \
tar caf wxcurl-$(VERSION).tar.gz wxcurl-$(VERSION)
mk-origtargz --compression gzip --repack \
utmp/wxcurl-$(VERSION).tar.gz \
&& rm -rf utmp
# The project does not define a testsuite.
wxcurl source: testsuite-autopkgtest-missing
# get-orig-source is used as a workaround for #831870.
wxcurl source: debian-rules-contains-unnecessary-get-orig-source-target
---
Bug-Database: https://sourceforge.net/p/wxcode/bugs/
Bug-Submit: https://sourceforge.net/p/wxcode/bugs/new/
Name: wxcurl
......
version=4
opts="dversionmangle=s/\+ds$//,repacksuffix=+ds" \
opts="dversionmangle=s/\+dfsg\.[0-9]+$//,repacksuffix=+dfsg.1" \
https://sf.net/wxcode/wxcurl-(.+)\.zip debian uupdate