diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2024-02-02 08:33:06 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2024-02-02 08:33:06 +0100 |
| commit | 5c869722c188cb08fb79d136c4c5d5686ef03331 (patch) | |
| tree | c9213412bc4fae1023a2dbe96cf030d542b8fad4 /tools | |
| parent | bc464679a733986632c2ce7117daea8a91a67aed (diff) | |
| download | weechat-5c869722c188cb08fb79d136c4c5d5686ef03331.zip | |
core: disable CJSON in Debian/buster, Raspbian/buster and Ubuntu/focal builds (issue #2066)
This is because in these versions the libcjson-dev package doesn't provide
pkg-config file.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/debian/patches/weechat_debian_buster.patch | 28 | ||||
| -rw-r--r-- | tools/debian/patches/weechat_ubuntu_focal.patch | 24 |
2 files changed, 50 insertions, 2 deletions
diff --git a/tools/debian/patches/weechat_debian_buster.patch b/tools/debian/patches/weechat_debian_buster.patch index ecb3483ff..096c50ef3 100644 --- a/tools/debian/patches/weechat_debian_buster.patch +++ b/tools/debian/patches/weechat_debian_buster.patch @@ -1,5 +1,5 @@ diff --git a/debian-devel/control b/debian-devel/control -index 1abbda247..0db73f390 100644 +index a5d24b6a8..edae1ec5e 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -14,7 +14,7 @@ Build-Depends: @@ -11,8 +11,20 @@ index 1abbda247..0db73f390 100644 php-dev, libphp-embed, libargon2-dev, libsodium-dev, libxml2-dev, libcurl4-gnutls-dev, +diff --git a/debian-devel/rules b/debian-devel/rules +index cab713c93..d2756333b 100755 +--- a/debian-devel/rules ++++ b/debian-devel/rules +@@ -8,6 +8,7 @@ override_dh_auto_configure: + dh_auto_configure --buildsystem=cmake -- \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \ ++ -DENABLE_CJSON:BOOL=OFF \ + -DENABLE_DOC:BOOL=ON \ + -DENABLE_MAN:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ diff --git a/debian-stable/control b/debian-stable/control -index 428f11ce9..dcf71da3e 100644 +index a75e6fee5..50c4f69a8 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -14,7 +14,7 @@ Build-Depends: @@ -24,3 +36,15 @@ index 428f11ce9..dcf71da3e 100644 php-dev, libphp-embed, libargon2-dev, libsodium-dev, libxml2-dev, libcurl4-gnutls-dev, +diff --git a/debian-stable/rules b/debian-stable/rules +index cab713c93..d2756333b 100755 +--- a/debian-stable/rules ++++ b/debian-stable/rules +@@ -8,6 +8,7 @@ override_dh_auto_configure: + dh_auto_configure --buildsystem=cmake -- \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \ ++ -DENABLE_CJSON:BOOL=OFF \ + -DENABLE_DOC:BOOL=ON \ + -DENABLE_MAN:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ diff --git a/tools/debian/patches/weechat_ubuntu_focal.patch b/tools/debian/patches/weechat_ubuntu_focal.patch new file mode 100644 index 000000000..10cd0f6ff --- /dev/null +++ b/tools/debian/patches/weechat_ubuntu_focal.patch @@ -0,0 +1,24 @@ +diff --git a/debian-devel/rules b/debian-devel/rules +index cab713c93..d2756333b 100755 +--- a/debian-devel/rules ++++ b/debian-devel/rules +@@ -8,6 +8,7 @@ override_dh_auto_configure: + dh_auto_configure --buildsystem=cmake -- \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \ ++ -DENABLE_CJSON:BOOL=OFF \ + -DENABLE_DOC:BOOL=ON \ + -DENABLE_MAN:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ +diff --git a/debian-stable/rules b/debian-stable/rules +index cab713c93..d2756333b 100755 +--- a/debian-stable/rules ++++ b/debian-stable/rules +@@ -8,6 +8,7 @@ override_dh_auto_configure: + dh_auto_configure --buildsystem=cmake -- \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \ ++ -DENABLE_CJSON:BOOL=OFF \ + -DENABLE_DOC:BOOL=ON \ + -DENABLE_MAN:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ |