[boinc] 06/08: Drop patches upstream, patch refresh
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Wed Feb 14 15:02:03 UTC 2018
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository boinc.
commit 5257453025d2a81984f26a57d0a1871e9c1f7422
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Feb 14 14:54:46 2018 +0100
Drop patches upstream, patch refresh
---
.../0001-Fix-build-with-new-glibc-2.26.patch | 29 ------
debian/patches/2260.patch | 109 ---------------------
debian/patches/MainDocumentWarnings.patch | 12 ++-
debian/patches/boinclib_shared.patch | 26 +++--
debian/patches/de.po.patch | 12 ++-
debian/patches/disable_new_version_check.patch | 14 ++-
.../file_upload_handler_in_sched_linking.patch | 10 +-
debian/patches/fix-underlinking.patch | 2 +-
debian/patches/fopen_closing.patch | 36 ++++---
debian/patches/series | 3 -
debian/patches/static_scientific_apps.patch | 37 +++----
.../use-wxhtmlwindow-instead-of-wxwebview.patch | 104 --------------------
12 files changed, 86 insertions(+), 308 deletions(-)
diff --git a/debian/patches/0001-Fix-build-with-new-glibc-2.26.patch b/debian/patches/0001-Fix-build-with-new-glibc-2.26.patch
deleted file mode 100644
index 3c46728..0000000
--- a/debian/patches/0001-Fix-build-with-new-glibc-2.26.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a6906ee560e07383ff4c521167d103382d416cba Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Date: Thu, 7 Sep 2017 09:33:21 +0200
-Subject: [PATCH] Fix build with new glibc 2.26 * The nonstandard header
- <xlocale.h> has been removed. Most programs should use <locale.h>
- instead. If you have a specific need for the definition of locale_t with
- no other declarations, please contact libc-alpha at sourceware.org and
- explain.
-
----
- clientgui/AsyncRPC.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
-index f196ced8b1..e9c249d415 100644
---- a/clientgui/AsyncRPC.cpp
-+++ b/clientgui/AsyncRPC.cpp
-@@ -19,7 +19,7 @@
- #pragma implementation "AsyncRPC.h"
- #endif
-
--#if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
-+#if HAVE_XLOCALE_H
- #include <xlocale.h>
- #endif
-
---
-2.11.0
-
diff --git a/debian/patches/2260.patch b/debian/patches/2260.patch
deleted file mode 100644
index e019953..0000000
--- a/debian/patches/2260.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 2674c25be45e8c96ac453c4107b69e96006d0166 Mon Sep 17 00:00:00 2001
-From: Bryan Quigley <bryan.quigley at canonical.com>
-Date: Mon, 27 Nov 2017 00:08:14 -0500
-Subject: [PATCH] Add generated systemd unit
-
-Both Fedora and Debian have their own systemd units for boinc;
-this is based on elements of both so we stop duplicating effort.
-
-This also adds minimal confinement to protect the home directories.
-
-Also added clean to init.d script and made it only install if a
-init.d directory already exists.
-
-Closes: #2255
----
- .gitignore | 1 +
- client/scripts/Makefile.am | 22 +++++++++++++++++-----
- client/scripts/boinc-client.service.in | 19 +++++++++++++++++++
- configure.ac | 1 +
- 4 files changed, 38 insertions(+), 5 deletions(-)
- create mode 100644 client/scripts/boinc-client.service.in
-
-diff --git a/.gitignore b/.gitignore
-index a7745b5cf7..f32845e326 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -81,6 +81,7 @@ boinc_path_config.py
- pkginfo
- prototype
- client/scripts/boinc-client
-+client/scripts/boinc-client.service
- config.h
- config.log
- config.status
-diff --git a/client/scripts/Makefile.am b/client/scripts/Makefile.am
-index 67d3820156..ae90a810d7 100644
---- a/client/scripts/Makefile.am
-+++ b/client/scripts/Makefile.am
-@@ -2,16 +2,28 @@
-
- install-exec-hook:
- chmod +x boinc-client
-- $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d
-- $(INSTALL) -b boinc-client $(DESTDIR)$(sysconfdir)/init.d/boinc-client
-+ if [ -d /etc/init.d ] ; then \
-+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d ; \
-+ $(INSTALL) -b boinc-client $(DESTDIR)$(sysconfdir)/init.d/boinc-client ; \
-+ fi
-+ if [ -d /usr/lib/systemd/system ] ; then \
-+ $(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system/ ; \
-+ $(INSTALL_DATA) boinc-client.service $(DESTDIR)/usr/lib/systemd/system/boinc-client.service ; \
-+ elif [ -d /lib/systemd/system ] ; then \
-+ $(INSTALL) -d $(DESTDIR)/lib/systemd/system/ ; \
-+ $(INSTALL_DATA) boinc-client.service $(DESTDIR)/lib/systemd/system/boinc-client.service ; \
-+ fi
- if [ -d /etc/sysconfig ] ; then \
- $(INSTALL) -d $(DESTDIR)$(sysconfdir)/sysconfig ; \
-- $(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/sysconfig/boinc-client ; \
-+ $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/sysconfig/boinc-client ; \
- elif [ -d /etc/default ] ; then \
- $(INSTALL) -d $(DESTDIR)$(sysconfdir)/default ; \
-- $(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client ; \
-+ $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client ; \
- else \
- $(INSTALL) -d $(DESTDIR)$(sysconfdir) ; \
-- $(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/boinc-client.conf ; \
-+ $(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/boinc-client.conf ; \
- fi
-
-+clean:
-+ rm boinc-client.service
-+ rm boinc-client
-diff --git a/client/scripts/boinc-client.service.in b/client/scripts/boinc-client.service.in
-new file mode 100644
-index 0000000000..4f52467ea0
---- /dev/null
-+++ b/client/scripts/boinc-client.service.in
-@@ -0,0 +1,19 @@
-+[Unit]
-+Description=Berkeley Open Infrastructure Network Computing Client
-+Documentation=man:boinc(1)
-+After=network-online.target
-+
-+[Service]
-+ProtectHome=true
-+Type=simple
-+Nice=10
-+User=boinc
-+WorkingDirectory=~
-+ExecStart=@exec_prefix@/bin/boinc
-+ExecStop=@exec_prefix@/bin/boinccmd --quit
-+ExecReload=@exec_prefix@/bin/boinccmd --read_cc_config
-+ExecStopPost=/bin/rm -f lockfile
-+IOSchedulingClass=idle
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/configure.ac b/configure.ac
-index 8e2115385c..d1a0654e61 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1302,6 +1302,7 @@ AC_CONFIG_FILES([
- client/win/boinc_path_config.py:py/boinc_path_config.py.in
- client/scripts/Makefile
- client/scripts/boinc-client
-+ client/scripts/boinc-client.service
- db/Makefile
- doc/Makefile
- doc/manpages/Makefile
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index d3370e4..01b5329 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -1,8 +1,10 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
---- a/clientgui/MainDocument.cpp
-+++ b/clientgui/MainDocument.cpp
-@@ -1691,7 +1691,6 @@
+Index: boinc/clientgui/MainDocument.cpp
+===================================================================
+--- boinc.orig/clientgui/MainDocument.cpp
++++ boinc/clientgui/MainDocument.cpp
+@@ -1694,7 +1694,6 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +12,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
char currentDir[1024];
char thePIDbuf[20];
int id, iRetVal;
-@@ -1699,12 +1698,13 @@
+@@ -1702,12 +1701,13 @@
if (g_use_sandbox) {
snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -30,7 +32,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1714,6 +1714,10 @@
+@@ -1717,6 +1717,10 @@
0,
id
);
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 3c759c5..aec3b97 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -5,7 +5,7 @@ Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
-@@ -176,7 +176,7 @@
+@@ -178,7 +178,7 @@
libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -14,7 +14,7 @@ Index: boinc/lib/Makefile.am
libboinc_la_LIBADD =
if ENABLE_BOINCCRYPT
-@@ -184,7 +184,7 @@
+@@ -186,7 +186,7 @@
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
@@ -82,8 +82,10 @@ Index: boinc/clientscr/Makefile.am
## for an entirely statically linked library, you may want to try
## -all-static instead. There's a good chance it won't work properly,
## so we'll use the safer "-static-libtool-libs" by default.
---- boinc-7.6.7+dfsg.orig/sched/Makefile.am
-+++ boinc-7.6.7+dfsg/sched/Makefile.am
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am
++++ boinc/sched/Makefile.am
@@ -4,7 +4,6 @@
include $(top_srcdir)/Makefile.incl
@@ -92,9 +94,11 @@ Index: boinc/clientscr/Makefile.am
if ENABLE_LIBRARIES
---- boinc-7.6.7+dfsg.orig/tools/Makefile.am
-+++ boinc-7.6.7+dfsg/tools/Makefile.am
-@@ -44,7 +44,6 @@ dist_tools_DATA = \
+Index: boinc/tools/Makefile.am
+===================================================================
+--- boinc.orig/tools/Makefile.am
++++ boinc/tools/Makefile.am
+@@ -44,7 +44,6 @@
gui_urls.xml
AM_CXXFLAGS += $(MYSQL_CFLAGS)
@@ -102,9 +106,11 @@ Index: boinc/clientscr/Makefile.am
cancel_jobs_SOURCES = cancel_jobs.cpp
cancel_jobs_LDADD = $(SERVERLIBS)
---- boinc-7.6.7+dfsg.orig/vda/Makefile.am
-+++ boinc-7.6.7+dfsg/vda/Makefile.am
-@@ -4,7 +4,6 @@ vdadir=$(prefix)/lib/boinc-server-maker/
+Index: boinc/vda/Makefile.am
+===================================================================
+--- boinc.orig/vda/Makefile.am
++++ boinc/vda/Makefile.am
+@@ -4,7 +4,6 @@
vda_PROGRAMS = vda vdad ssim
AM_CXXFLAGS += $(MYSQL_CFLAGS)
diff --git a/debian/patches/de.po.patch b/debian/patches/de.po.patch
index 2fea79f..d9b4c18 100644
--- a/debian/patches/de.po.patch
+++ b/debian/patches/de.po.patch
@@ -1,7 +1,9 @@
Description: fixing some "de" typos, this should be addressed on other languages aswell.
---- a/html/languages/translations/de.po
-+++ b/html/languages/translations/de.po
-@@ -1209,8 +1209,8 @@
+Index: boinc/html/languages/translations/de.po
+===================================================================
+--- boinc.orig/html/languages/translations/de.po
++++ boinc/html/languages/translations/de.po
+@@ -1248,8 +1248,8 @@
#: html/inc/prefs.inc:58
#, no-php-format
@@ -12,7 +14,7 @@ Description: fixing some "de" typos, this should be addressed on other languages
#: html/inc/prefs.inc:63
#, no-php-format
-@@ -1222,8 +1222,8 @@
+@@ -1261,8 +1261,8 @@
#: html/inc/prefs.inc:66
#, no-php-format
@@ -23,7 +25,7 @@ Description: fixing some "de" typos, this should be addressed on other languages
#: html/inc/prefs.inc:68 html/inc/prefs.inc:214
msgid "When to suspend"
-@@ -1377,8 +1377,8 @@
+@@ -1416,8 +1416,8 @@
#: html/inc/prefs.inc:158
#, no-php-format
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 4541fc6..637e31b 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -10,9 +10,11 @@ Forwarded: not-needed
Reviewed-By: costamagnagianfranco at yahoo.it
Last-Update: <2013-03-07>
---- a/client/client_state.cpp
-+++ b/client/client_state.cpp
-@@ -598,7 +598,7 @@
+Index: boinc/client/client_state.cpp
+===================================================================
+--- boinc.orig/client/client_state.cpp
++++ boinc/client/client_state.cpp
+@@ -621,7 +621,7 @@
// inform the user if there's a newer version of client
//
@@ -21,8 +23,10 @@ Last-Update: <2013-03-07>
// parse account files again,
// now that we know the host's venue on each project
---- a/client/scheduler_op.cpp
-+++ b/client/scheduler_op.cpp
+Index: boinc/client/scheduler_op.cpp
+===================================================================
+--- boinc.orig/client/scheduler_op.cpp
++++ boinc/client/scheduler_op.cpp
@@ -138,7 +138,7 @@
// and project list
//
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index 1df82ad..80c1da1 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,7 +1,9 @@
Description: Link LIBBOINC to some binary needing it.
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
-@@ -276,7 +276,7 @@
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am
++++ boinc/sched/Makefile.am
+@@ -277,7 +277,7 @@
update_stats_LDADD = $(SERVERLIBS)
file_upload_handler_SOURCES = file_upload_handler.cpp sched_config.cpp sched_util_basic.cpp sched_limit.cpp
@@ -10,7 +12,7 @@ Description: Link LIBBOINC to some binary needing it.
make_work_SOURCES = make_work.cpp
make_work_LDADD = $(SERVERLIBS)
-@@ -317,7 +317,7 @@
+@@ -318,7 +318,7 @@
file_upload_handler.cpp \
sched_config.cpp
fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
diff --git a/debian/patches/fix-underlinking.patch b/debian/patches/fix-underlinking.patch
index 706b313..f60bdb8 100644
--- a/debian/patches/fix-underlinking.patch
+++ b/debian/patches/fix-underlinking.patch
@@ -33,7 +33,7 @@ Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
-@@ -184,8 +184,8 @@
+@@ -186,8 +186,8 @@
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index c07d316..a8e467f 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -1,8 +1,10 @@
Description: this patch makes boinc correctly close the open files.
This patch allows also MFILE to correctly deallocate its pointers by calling close().
---- a/lib/crypt_prog.cpp
-+++ b/lib/crypt_prog.cpp
-@@ -168,6 +168,8 @@ int main(int argc, char** argv) {
+Index: boinc/lib/crypt_prog.cpp
+===================================================================
+--- boinc.orig/lib/crypt_prog.cpp
++++ boinc/lib/crypt_prog.cpp
+@@ -168,6 +168,8 @@
if (!fpub) die("fopen");
print_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
print_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
@@ -11,7 +13,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-sign")) {
if (argc < 4) {
-@@ -182,6 +184,7 @@ int main(int argc, char** argv) {
+@@ -182,6 +184,7 @@
signature.len = 256;
retval = sign_file(argv[2], private_key, signature);
print_hex_data(stdout, signature);
@@ -19,7 +21,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-sign_string")) {
if (argc < 4) {
usage();
-@@ -193,6 +196,7 @@ int main(int argc, char** argv) {
+@@ -193,6 +196,7 @@
if (retval) die("scan_key_hex\n");
generate_signature(argv[2], cbuf, private_key);
puts(cbuf);
@@ -27,7 +29,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-verify")) {
if (argc < 5) {
usage();
-@@ -207,6 +211,8 @@ int main(int argc, char** argv) {
+@@ -207,6 +211,8 @@
signature.data = signature_buf;
signature.len = 256;
retval = scan_hex_data(f, signature);
@@ -36,7 +38,7 @@ Description: this patch makes boinc correctly close the open files.
if (retval) die("scan_hex_data");
char md5_buf[64];
-@@ -236,6 +242,8 @@ int main(int argc, char** argv) {
+@@ -236,6 +242,8 @@
if (!fpub) die("fopen");
retval = scan_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
if (retval) die("read_public_key");
@@ -45,7 +47,7 @@ Description: this patch makes boinc correctly close the open files.
strcpy((char*)buf2, "encryption test successful");
in.data = buf2;
in.len = strlen((char*)in.data);
-@@ -254,6 +262,7 @@ int main(int argc, char** argv) {
+@@ -254,6 +262,7 @@
signature.data = signature_buf;
signature.len = 256;
retval = scan_hex_data(f, signature);
@@ -53,7 +55,7 @@ Description: this patch makes boinc correctly close the open files.
if (retval) die("cannot scan_hex_data");
certpath = check_validity(argv[4], argv[2], signature.data, argv[5]);
if (certpath == NULL) {
-@@ -426,6 +435,7 @@ int main(int argc, char** argv) {
+@@ -426,6 +435,7 @@
die("fopen");
}
print_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
@@ -61,9 +63,11 @@ Description: this patch makes boinc correctly close the open files.
}
}
} else {
---- a/lib/mfile.cpp
-+++ b/lib/mfile.cpp
-@@ -43,7 +43,7 @@
+Index: boinc/lib/mfile.cpp
+===================================================================
+--- boinc.orig/lib/mfile.cpp
++++ boinc/lib/mfile.cpp
+@@ -42,7 +42,7 @@
}
MFILE::~MFILE() {
@@ -72,9 +76,11 @@ Description: this patch makes boinc correctly close the open files.
}
int MFILE::open(const char* path, const char* mode) {
---- a/lib/parse_test.cpp
-+++ b/lib/parse_test.cpp
-@@ -57,6 +57,7 @@ int main() {
+Index: boinc/lib/parse_test.cpp
+===================================================================
+--- boinc.orig/lib/parse_test.cpp
++++ boinc/lib/parse_test.cpp
+@@ -57,6 +57,7 @@
exit(1);
}
parse(f);
diff --git a/debian/patches/series b/debian/patches/series
index 6549ca8..05b2f14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,7 +29,4 @@ file_upload_handler_in_sched_linking.patch
disable_silent_rules.patch
fix-underlinking.patch
static_scientific_apps.patch
-0001-Fix-build-with-new-glibc-2.26.patch
hurd-fixes.patch
-use-wxhtmlwindow-instead-of-wxwebview.patch
-2260.patch
diff --git a/debian/patches/static_scientific_apps.patch b/debian/patches/static_scientific_apps.patch
index e665b09..e35fbb1 100644
--- a/debian/patches/static_scientific_apps.patch
+++ b/debian/patches/static_scientific_apps.patch
@@ -2,7 +2,7 @@ Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
-@@ -176,6 +176,10 @@ lib_LTLIBRARIES = libboinc.la
+@@ -178,6 +178,10 @@ lib_LTLIBRARIES = libboinc.la
libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -13,7 +13,7 @@ Index: boinc/lib/Makefile.am
libboinc_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_la_LIBADD =
-@@ -184,6 +188,10 @@ lib_LTLIBRARIES += libboinc_crypt.la
+@@ -186,6 +190,10 @@ lib_LTLIBRARIES += libboinc_crypt.la
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
@@ -24,7 +24,7 @@ Index: boinc/lib/Makefile.am
libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
libboinc_crypt_la_LIBADD = $(LIBBOINC)
endif
-@@ -193,6 +201,10 @@ lib_LTLIBRARIES += libboinc_fcgi.la
+@@ -195,6 +203,10 @@ lib_LTLIBRARIES += libboinc_fcgi.la
libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources)
libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -34,34 +34,35 @@ Index: boinc/lib/Makefile.am
+libboinc_fcgi_a_RANLIB = gcc-ranlib
libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_fcgi_la_LIBADD =
- endif
-@@ -256,7 +268,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
+ endif
+@@ -258,7 +270,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
msg_test_LDADD = $(LIBBOINC)
- crypt_prog_SOURCES = crypt_prog.cpp
+ crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
--crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
+-crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
+crypt_prog_LDADD = $(LIBBOINC_CRYPT) $(LIBBOINC) $(SSL_LIBS)
- parse_test_SOURCES = parse_test.cpp
+ parse_test_SOURCES = parse_test.cpp
parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
parse_test_LDADD = $(LIBBOINC)
Index: boinc/samples/condor/Makefile
===================================================================
--- boinc.orig/samples/condor/Makefile
+++ boinc/samples/condor/Makefile
-@@ -1,14 +1,17 @@
+@@ -1,18 +1,18 @@
all: boinc_gahp
clean:
-- rm boinc_gahp
-+ rm boinc_gahp libcurl.a
+- rm -f boinc_gahp
++ rm -f boinc_gahp libcurl.a
--boinc_gahp: boinc_gahp.cpp ../../lib/remote_submit.h ../../lib/remote_submit.cpp
-- g++ -g -O0 -I../../lib \
-+libcurl.a:
-+ ln -s `$(CXX) -print-file-name=libcurl.a`
-+
-+boinc_gahp: boinc_gahp.cpp ../../lib/remote_submit.h ../../lib/remote_submit.cpp $(BOINC_LIB_DIR)/libboinc.a
-+ $(CXX) $(CPPFLAGS) -static -pthread -g -O0 -I../../lib \
+ distclean: clean
+
+ distclean-recursive: clean
+
+-boinc_gahp: boinc_gahp.cpp ../../lib/remote_submit.h ../../lib/remote_submit.cpp ../../svn_version.h
+- g++ -g -O0 -I../../lib -I../.. \
++boinc_gahp: boinc_gahp.cpp ../../lib/remote_submit.h ../../lib/remote_submit.cpp ../../svn_version.h $(CXX) $(CPPFLAGS) -static -pthread -g -O0 -I../../lib -I../.. \
++ $(CXX) $(CPPFLAGS) -static -pthread -g -O0 -I../../lib -I../.. \
-o boinc_gahp boinc_gahp.cpp ../../lib/remote_submit.cpp \
- -L../../lib -lboinc -lpthread -lcurl
+ $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a libcurl.a
diff --git a/debian/patches/use-wxhtmlwindow-instead-of-wxwebview.patch b/debian/patches/use-wxhtmlwindow-instead-of-wxwebview.patch
deleted file mode 100644
index de5a526..0000000
--- a/debian/patches/use-wxhtmlwindow-instead-of-wxwebview.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: Use wxHtmlWindow instead of wxWebView
-Author: Olly Betts <olly at survex.com>
-Forwarded: no
-Last-Update: 2017-09-26
-
---- a/clientgui/NoticeListCtrl.cpp
-+++ b/clientgui/NoticeListCtrl.cpp
-@@ -50,8 +50,8 @@
- BEGIN_EVENT_TABLE( CNoticeListCtrl, wxWindow )
-
- ////@begin CNoticeListCtrl event table entries
-- EVT_WEBVIEW_NAVIGATING(ID_LIST_NOTIFICATIONSVIEW, CNoticeListCtrl::OnLinkClicked)
-- EVT_WEBVIEW_ERROR(ID_LIST_NOTIFICATIONSVIEW, CNoticeListCtrl::OnWebViewError)
-+ EVT_HTML_LINK_CLICKED(ID_LIST_NOTIFICATIONSVIEW, CNoticeListCtrl::OnLinkClicked)
-+// EVT_WEBVIEW_ERROR(ID_LIST_NOTIFICATIONSVIEW, CNoticeListCtrl::OnWebViewError)
- ////@end CNoticeListCtrl event table entries
-
- END_EVENT_TABLE()
-@@ -84,7 +84,7 @@
- wxWindow::Create( parent, ID_LIST_NOTIFICATIONSVIEW, wxDefaultPosition, wxDefaultSize,
- wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
-
-- m_browser = wxWebView::New( this, ID_LIST_NOTIFICATIONSVIEW );
-+ m_browser = new wxHtmlWindow( this, ID_LIST_NOTIFICATIONSVIEW );
- ////@end CNoticeListCtrl creation
-
- wxBoxSizer *topsizer;
-@@ -238,7 +238,7 @@
- m_noticesBody += wxT("</font></body></html>");
- // baseURL is not needed here (see comments above) and it
- // must be an empty string for this to work under OS 10.12.4
-- m_browser->SetPage(m_noticesBody, wxEmptyString);
-+ m_browser->SetPage(m_noticesBody);
- }
-
-
-@@ -248,22 +248,27 @@
- }
-
-
--void CNoticeListCtrl::OnLinkClicked( wxWebViewEvent& event ) {
-- if (event.GetURL().StartsWith(wxT("http://")) || event.GetURL().StartsWith(wxT("https://"))) {
-- event.Veto(); // Tell wxWebView not to follow link
-- wxLaunchDefaultBrowser(event.GetURL());
-+void CNoticeListCtrl::OnLinkClicked( wxHtmlLinkEvent& event ) {
-+ wxString url = event.GetLinkInfo().GetHref();
-+ if (url.StartsWith(wxT("http://")) || url.StartsWith(wxT("https://"))) {
-+ // wxHtmlLinkEvent doesn't have Veto(), but only loads the page if you
-+ // call Skip().
-+ // event.Veto(); // Tell wxWebView not to follow link
-+ wxLaunchDefaultBrowser(url);
- } else {
- event.Skip();
- }
- }
-
-
-+#if 0
- void CNoticeListCtrl::OnWebViewError( wxWebViewEvent& event ) {
- fprintf(stderr, "wxWebView error: target=%s, URL=%s\n",
- (event.GetTarget().ToStdString()).c_str(), (event.GetURL().ToStdString()).c_str());
-
- event.Skip();
- }
-+#endif
-
-
- /*!
---- a/clientgui/NoticeListCtrl.h
-+++ b/clientgui/NoticeListCtrl.h
-@@ -45,8 +45,8 @@
-
- ////@begin CNoticeListCtrl event handler declarations
-
-- void OnLinkClicked( wxWebViewEvent& event );
-- void OnWebViewError( wxWebViewEvent& event );
-+ void OnLinkClicked( wxHtmlLinkEvent& event );
-+// void OnWebViewError( wxWebViewEvent& event );
-
- ////@end CNoticeListCtrl event handler declarations
-
-@@ -56,7 +56,7 @@
- bool m_bDisplayFetchingNotices;
- bool m_bDisplayEmptyNotice;
- private:
-- wxWebView* m_browser;
-+ wxHtmlWindow* m_browser;
- bool m_bNeedsReloading;
- int m_itemCount;
- wxString m_noticesBody;
---- a/clientgui/stdwx.h
-+++ b/clientgui/stdwx.h
-@@ -117,8 +117,11 @@
- #include <wx/mstream.h>
- #include <wx/hash.h>
- #include <wx/selstore.h>
-+#if 0
- #include <wx/webview.h>
- #include <wx/webviewfshandler.h>
-+#endif
-+#include <wx/html/htmlwin.h>
- #include <wx/snglinst.h>
- #include <wx/bmpcbox.h>
- #include <wx/evtloop.h>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list