mirror of https://gitee.com/openkylin/cwidget.git
Fix cwidget and aptitude FTBFS
This commit is contained in:
parent
0efc84c16b
commit
004a8b4b39
|
@ -0,0 +1 @@
|
|||
po/libcwidget4.pot
|
|
@ -1 +0,0 @@
|
|||
12
|
|
@ -5,7 +5,7 @@ Homepage: https://salsa.debian.org/cwidget-team/
|
|||
Vcs-Git: https://gitee.com/openkylin/cwidget.git
|
||||
Vcs-Browser: https://gitee.com/openkylin/cwidget
|
||||
Maintainer: Openkylin Developers <packaging@lists.openkylin.top>
|
||||
Build-Depends: debhelper (>= 12~),
|
||||
Build-Depends: debhelper-compat (= 13),
|
||||
gettext,
|
||||
libcppunit-dev (>= 1.13.2-0),
|
||||
libncurses-dev (>= 6.0+20180210),
|
||||
|
@ -15,7 +15,7 @@ Build-Depends-Indep: doxygen,
|
|||
libhtml-scrubber-perl,
|
||||
libimage-magick-perl
|
||||
Rules-Requires-Root: no
|
||||
Standards-Version: 4.3.0
|
||||
Standards-Version: 4.6.1
|
||||
|
||||
Package: libcwidget4
|
||||
Architecture: any
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
From eecbdc90642ca124afde7f9548dbc8500cb96907 Mon Sep 17 00:00:00 2001
|
||||
From: Sven Joachim <svenjoac@gmx.de>
|
||||
Date: Mon, 26 Aug 2019 20:21:32 +0200
|
||||
Subject: [PATCH] Change gettext domainname to 'libcwidget4'
|
||||
|
||||
This accommodates the domain to the changed SONAME.
|
||||
---
|
||||
po/Makevars | 2 +-
|
||||
src/cwidget/generic/util/i18n.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/po/Makevars b/po/Makevars
|
||||
index 45c398c..df35198 100644
|
||||
--- a/po/Makevars
|
||||
+++ b/po/Makevars
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
# Use library package name, to not clash with other versions if several are
|
||||
# installed at the same time
|
||||
-DOMAIN = libcwidget3
|
||||
+DOMAIN = libcwidget4
|
||||
|
||||
|
||||
# These two variables depend on the location of this directory.
|
||||
diff --git a/src/cwidget/generic/util/i18n.h b/src/cwidget/generic/util/i18n.h
|
||||
index 88fb058..66f975e 100644
|
||||
--- a/src/cwidget/generic/util/i18n.h
|
||||
+++ b/src/cwidget/generic/util/i18n.h
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
// i18n definitions
|
||||
|
||||
-#define CWIDGET_DOMAIN "libcwidget3"
|
||||
+#define CWIDGET_DOMAIN "libcwidget4"
|
||||
|
||||
|
||||
#ifdef HAVE_LOCALE_H
|
||||
--
|
||||
2.23.0
|
||||
|
|
@ -1 +0,0 @@
|
|||
0001-Change-gettext-domainname-to-libcwidget4-1.patch
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
|
||||
export DEB_CXXFLAGS_MAINT_APPEND := -pipe -Wall
|
||||
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
|
||||
|
||||
|
||||
%:
|
||||
|
@ -36,3 +35,6 @@ override_dh_installexamples:
|
|||
|
||||
override_dh_makeshlibs:
|
||||
dh_makeshlibs -V "libcwidget4 (>= 0.5.18-1)"
|
||||
|
||||
override_dh_missing:
|
||||
dh_missing --list-missing
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#define THREADS_H
|
||||
|
||||
#include <errno.h>
|
||||
#include <pthread.h>
|
||||
#include <cwidget/generic/util/exception.h>
|
||||
|
||||
namespace cwidget
|
||||
|
|
Loading…
Reference in New Issue