* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/
@ 2017-04-10 9:16 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2017-04-10 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 71fbea0da5dc64de8ca05b2e8c0cdccd1d25a53e
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sat Apr 8 10:21:49 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 09:16:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fbea0d
app-i18n/uchardet: remove old.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4389
app-i18n/uchardet/Manifest | 1 -
.../files/uchardet-0.0.5-fix-ASCII-detection.patch | 116 ---------------------
.../uchardet-0.0.5-fix-return-code-on-error.patch | 19 ----
.../uchardet-0.0.5-use-proper-package-name.patch | 30 ------
app-i18n/uchardet/uchardet-0.0.5-r1.ebuild | 33 ------
5 files changed, 199 deletions(-)
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 3cdddba6209..9dfb9da8816 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,2 +1 @@
-DIST uchardet-0.0.5.tar.gz 222864 SHA256 7c5569c8ee1a129959347f5340655897e6a8f81ec3344de0012a243f868eabd1 SHA512 e32ff3e7baa9804199e3ca240ce590fed3fcb539fe4d780c4ec205fa5cbd45415e2c8c8db51d97965f9f9bbaad1f34613d5ed2849aafd9bbc3dda850c0be20ac WHIRLPOOL 737becbbf1be09e049207311c964ee61e78bce3c3cdc31cd5a071a52aef22b5f0d803a243aac8b0f9840c19d27ffbac3e08454ec7a74c2bb85f19f15333e3af6
DIST uchardet-0.0.6.tar.xz 169192 SHA256 8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61 SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 WHIRLPOOL 3fa915fa768be9cb4002e0a1b84c120db017f59fd0011df36a4853c53b403d5f3839647ab7aff8d8691a43ef0ecc90714475ef6a46a85d20abbd57fba7d90a13
diff --git a/app-i18n/uchardet/files/uchardet-0.0.5-fix-ASCII-detection.patch b/app-i18n/uchardet/files/uchardet-0.0.5-fix-ASCII-detection.patch
deleted file mode 100644
index c82aee866eb..00000000000
--- a/app-i18n/uchardet/files/uchardet-0.0.5-fix-ASCII-detection.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-commit 4c8316f9cfda38d75fb015c0eb40e0eebb03d28f
-Author: Jehan <jehan@girinstud.io>
-Date: Sat Dec 5 21:04:20 2015 +0100
-
- Nearly-ASCII text with NBSP is still not ASCII.
-
- There is no "exception" in encoding. The non-breaking space 0xA0 is not
- ASCII, and therefore returning "ASCII" will later create issues (for
- instance trying to re-encode with iconv produces an error).
- This was obviously an explicit decision in original code (according to
- code comments), probably tied to specifity of the original program from
- Mozilla. Now we want strict detection.
- I will return "ISO-8859-1" for "nearly-ASCII texts with NBSP as only
- exception" (note that I could have returned any ISO-8859 charsets since
- they all have this character in common).
-
-diff --git a/src/nsUniversalDetector.cpp b/src/nsUniversalDetector.cpp
-index ab8bae0..ff06b9d 100644
---- a/src/nsUniversalDetector.cpp
-+++ b/src/nsUniversalDetector.cpp
-@@ -47,6 +47,7 @@
-
- nsUniversalDetector::nsUniversalDetector(PRUint32 aLanguageFilter)
- {
-+ mNbspFound = PR_FALSE;
- mDone = PR_FALSE;
- mBestGuess = -1; //illegal value as signal
- mInTag = PR_FALSE;
-@@ -75,6 +76,7 @@ nsUniversalDetector::~nsUniversalDetector()
- void
- nsUniversalDetector::Reset()
- {
-+ mNbspFound = PR_FALSE;
- mDone = PR_FALSE;
- mBestGuess = -1; //illegal value as signal
- mInTag = PR_FALSE;
-@@ -162,9 +164,10 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
- PRUint32 i;
- for (i = 0; i < aLen; i++)
- {
-- /* Other than 0xA0, if every other character is ASCII, the page is ASCII.
-+ /* If every other character is ASCII or 0xA0, we don't run charset
-+ * probers.
- * 0xA0 (NBSP in a few charset) is apparently a rare exception
-- * of non-ASCII character contained in ASCII text. */
-+ * of non-ASCII character often contained in nearly-ASCII text. */
- if (aBuf[i] & '\x80' && aBuf[i] != '\xA0')
- {
- /* We got a non-ASCII byte (high-byte) */
-@@ -203,11 +206,19 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
- }
- else
- {
-- //ok, just pure ascii so far
-- if ( ePureAscii == mInputState &&
-- (aBuf[i] == '\033' || (aBuf[i] == '{' && mLastChar == '~')) )
-+ /* Just pure ASCII or NBSP so far. */
-+ if (aBuf[i] == '\xA0')
- {
-- //found escape character or HZ "~{"
-+ /* ASCII with the only exception of NBSP seems quite common.
-+ * I doubt it is really necessary to train a model here, so let's
-+ * just make an exception.
-+ */
-+ mNbspFound = PR_TRUE;
-+ }
-+ else if (mInputState == ePureAscii &&
-+ (aBuf[i] == '\033' || (aBuf[i] == '{' && mLastChar == '~')))
-+ {
-+ /* We found an escape character or HZ "~{". */
- mInputState = eEscAscii;
- }
- mLastChar = aBuf[i];
-@@ -229,6 +240,10 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
- mDone = PR_TRUE;
- mDetectedCharset = mEscCharSetProber->GetCharSetName();
- }
-+ else if (mNbspFound)
-+ {
-+ mDetectedCharset = "ISO-8859-1";
-+ }
- else
- {
- /* ASCII with the ESC character (or the sequence "~{") is still
-@@ -253,8 +268,17 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
- break;
-
- default:
-- /* Pure ASCII */
-- mDetectedCharset = "ASCII";
-+ if (mNbspFound)
-+ {
-+ /* ISO-8859-1 is a good result candidate for ASCII + NBSP.
-+ * (though it could have been any ISO-8859 encoding). */
-+ mDetectedCharset = "ISO-8859-1";
-+ }
-+ else
-+ {
-+ /* Pure ASCII */
-+ mDetectedCharset = "ASCII";
-+ }
- break;
- }
- return NS_OK;
-diff --git a/src/nsUniversalDetector.h b/src/nsUniversalDetector.h
-index 4d9b460..9f0a4b1 100644
---- a/src/nsUniversalDetector.h
-+++ b/src/nsUniversalDetector.h
-@@ -72,6 +72,7 @@ protected:
- virtual void Report(const char* aCharset) = 0;
- virtual void Reset();
- nsInputState mInputState;
-+ PRBool mNbspFound;
- PRBool mDone;
- PRBool mInTag;
- PRBool mStart;
diff --git a/app-i18n/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch b/app-i18n/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
deleted file mode 100644
index 3b943afea15..00000000000
--- a/app-i18n/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 248d6dbd351c22989090d318128cb38b11a89f98
-Author: Jehan <jehan@girinstud.io>
-Date: Thu Jan 21 18:16:42 2016 +0100
-
- tools: exit with non-zero value on uchardet error.
-
-diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp
-index 91912a0..bcfa234 100644
---- a/src/tools/uchardet.cpp
-+++ b/src/tools/uchardet.cpp
-@@ -60,7 +60,7 @@ void detect(FILE * fp)
- if (retval != 0)
- {
- fprintf(stderr, "Handle data error.\n");
-- exit(0);
-+ exit(1);
- }
- }
- uchardet_data_end(handle);
diff --git a/app-i18n/uchardet/files/uchardet-0.0.5-use-proper-package-name.patch b/app-i18n/uchardet/files/uchardet-0.0.5-use-proper-package-name.patch
deleted file mode 100644
index b1ed88991cf..00000000000
--- a/app-i18n/uchardet/files/uchardet-0.0.5-use-proper-package-name.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit b6d872bbec3be7abfccbdfd3d90e784cf7281c55
-Author: Jehan <jehan@girinstud.io>
-Date: Tue Dec 15 21:40:16 2015 +0100
-
- app: package name wrong in CMakeLists.txt.
-
- Probably coming from a copy-paste error when the build system was
- originally created.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b65c49..4f279e1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- ######## Project settings
- cmake_minimum_required(VERSION 2.8)
--set (PACKAGE_NAME opencc)
-+set (PACKAGE_NAME uchardet)
- project (${PACKAGE_NAME} CXX C)
- enable_testing()
-
-@@ -54,7 +54,7 @@ if (DEFINED SYSCONF_INSTALL_DIR)
- set (DIR_ETC ${SYSCONF_INSTALL_DIR})
- endif (DEFINED SYSCONF_INSTALL_DIR)
-
--set (DIR_SHARE_UCHARDET ${DIR_SHARE}/opencc)
-+set (DIR_SHARE_UCHARDET ${DIR_SHARE}/uchardet)
- set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
-
- ######## Configuration
diff --git a/app-i18n/uchardet/uchardet-0.0.5-r1.ebuild b/app-i18n/uchardet/uchardet-0.0.5-r1.ebuild
deleted file mode 100644
index 0a11837722c..00000000000
--- a/app-i18n/uchardet/uchardet-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="An encoding detector library"
-HOMEPAGE="https://github.com/BYVoid/uchardet https://www.freedesktop.org/wiki/Software/uchardet/"
-SRC_URI="https://github.com/BYVoid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc64 x86"
-IUSE="static-libs test"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-ASCII-detection.patch"
- "${FILESDIR}/${P}-use-proper-package-name.patch"
- "${FILESDIR}/${P}-fix-return-code-on-error.patch"
-)
-
-src_prepare() {
- use test || cmake_comment_add_subdirectory test
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build static-libs STATIC)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/
@ 2017-11-19 14:32 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-11-19 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 6a9d8fce1d916fc8590d654598648866978d4361
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Nov 19 13:11:36 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 14:31:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9d8fce
app-i18n/uchardet: backport patch to enforce IEEE float precision
Closes: https://bugs.gentoo.org/631852
Closes: https://github.com/gentoo/gentoo/pull/6237
Package-Manager: Portage-2.3.14, Repoman-2.3.6
...hardet-0.0.6-enforce-IEEE-float-precision.patch | 53 ++++++++++++++++++++++
app-i18n/uchardet/uchardet-0.0.6-r1.ebuild | 30 ++++++++++++
2 files changed, 83 insertions(+)
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision.patch
new file mode 100644
index 00000000000..010fe6a3140
--- /dev/null
+++ b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision.patch
@@ -0,0 +1,53 @@
+Add configuration option to enable SSE2.
+Add -ffloat-store flag on x86 without SSE2.
+
+Gentoo bug: https://bugs.gentoo.org/631852
+Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
+
+This patch is an aggregation of the following upstream commits:
+5996bbd995aed5045cc22e4d1fab08c989377983
+77bf71ea365a19ac55c59cf10399b566a02d82c1
+939482ab2b5a6585bdd2e5251f3f2f113d64686f
+cd617d181de03a7a13c2020e6c73cd14585e24b6
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 84270e3..e212b4a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ ######## Project settings
+ cmake_minimum_required(VERSION 2.8.5)
++include(CheckCCompilerFlag)
+ set (PACKAGE_NAME uchardet)
+ project (${PACKAGE_NAME} CXX C)
+ enable_testing()
+@@ -35,13 +36,27 @@ include(GNUInstallDirs)
+
+ ######## Configuration
+
+-option(BUILD_BINARY "Build executable" ON)
+-option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
++option(BUILD_BINARY "Build the CLI tool." ON)
++option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
++option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
+
+ if (BUILD_SHARED_LIBS)
+ option(BUILD_STATIC "Build static library" ON)
+ endif (BUILD_SHARED_LIBS)
+
++string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
++if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++ CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
++ CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
++ if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
++ else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
++ endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++
+ configure_file(
+ uchardet.pc.in
+ uchardet.pc
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r1.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r1.ebuild
new file mode 100644
index 00000000000..134abc5684e
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 static-libs test"
+
+PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision.patch" )
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_STATIC=$(usex static-libs)
+ -DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/
@ 2018-01-21 20:56 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2018-01-21 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 547fc02f60ead03d2784039314d2e2638c330de4
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Jan 21 16:47:44 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 20:56:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547fc02f
app-i18n/uchardet: backport patch to override dumb CPU autodetection
Closes: https://github.com/gentoo/gentoo/pull/6923
Closes: https://bugs.gentoo.org/641716
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...det-0.0.6-enforce-IEEE-float-precision-r1.patch | 59 ++++++++++++++++++++++
app-i18n/uchardet/uchardet-0.0.6-r2.ebuild | 31 ++++++++++++
2 files changed, 90 insertions(+)
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
new file mode 100644
index 00000000000..2bc4977a5f0
--- /dev/null
+++ b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
@@ -0,0 +1,59 @@
+Add configuration option to enable SSE2.
+Add -ffloat-store flag on x86 without SSE2.
+
+Gentoo bug: https://bugs.gentoo.org/631852
+Gentoo bug: https://bugs.gentoo.org/641716
+Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
+
+This patch is an aggregation of the following upstream commits:
+5996bbd995aed5045cc22e4d1fab08c989377983
+77bf71ea365a19ac55c59cf10399b566a02d82c1
+939482ab2b5a6585bdd2e5251f3f2f113d64686f
+cd617d181de03a7a13c2020e6c73cd14585e24b6
+f136d434f0809e064ac195b5bc4e0b50484a474c
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e9a699e..d140a24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ ######## Project settings
+ cmake_minimum_required(VERSION 2.8.5)
++include(CheckCCompilerFlag)
+ set (PACKAGE_NAME uchardet)
+ project (${PACKAGE_NAME} CXX C)
+ enable_testing()
+@@ -33,13 +34,31 @@ include(GNUInstallDirs)
+
+ ######## Configuration
+
+-option(BUILD_BINARY "Build executable" ON)
+-option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
++option(BUILD_BINARY "Build the CLI tool." ON)
++option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
++option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
++set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.")
+
+ if (BUILD_SHARED_LIBS)
+ option(BUILD_STATIC "Build static library" ON)
+ endif (BUILD_SHARED_LIBS)
+
++if (TARGET_ARCHITECTURE STREQUAL "")
++ string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
++endif (TARGET_ARCHITECTURE STREQUAL "")
++
++if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++ CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
++ CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
++ if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
++ else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
++ endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
++endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
++
+ configure_file(
+ uchardet.pc.in
+ uchardet.pc
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
new file mode 100644
index 00000000000..e5b19449663
--- /dev/null
+++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An encoding detector library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
+SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 static-libs test"
+
+PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DTARGET_ARCHITECTURE="${ARCH}"
+ -DBUILD_STATIC=$(usex static-libs)
+ -DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/
@ 2018-03-17 10:55 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2018-03-17 10:55 UTC (permalink / raw
To: gentoo-commits
commit: 83e28e9814824cce13db4f7ee5b07f86a3d73bf2
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Mar 16 18:57:17 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 10:54:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e28e98
app-i18n/uchardet: remove old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
...hardet-0.0.6-enforce-IEEE-float-precision.patch | 53 ----------------------
app-i18n/uchardet/uchardet-0.0.6-r1.ebuild | 30 ------------
app-i18n/uchardet/uchardet-0.0.6.ebuild | 31 -------------
3 files changed, 114 deletions(-)
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision.patch
deleted file mode 100644
index 010fe6a3140..00000000000
--- a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Add configuration option to enable SSE2.
-Add -ffloat-store flag on x86 without SSE2.
-
-Gentoo bug: https://bugs.gentoo.org/631852
-Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
-
-This patch is an aggregation of the following upstream commits:
-5996bbd995aed5045cc22e4d1fab08c989377983
-77bf71ea365a19ac55c59cf10399b566a02d82c1
-939482ab2b5a6585bdd2e5251f3f2f113d64686f
-cd617d181de03a7a13c2020e6c73cd14585e24b6
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 84270e3..e212b4a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,6 @@
- ######## Project settings
- cmake_minimum_required(VERSION 2.8.5)
-+include(CheckCCompilerFlag)
- set (PACKAGE_NAME uchardet)
- project (${PACKAGE_NAME} CXX C)
- enable_testing()
-@@ -35,13 +36,27 @@ include(GNUInstallDirs)
-
- ######## Configuration
-
--option(BUILD_BINARY "Build executable" ON)
--option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
-+option(BUILD_BINARY "Build the CLI tool." ON)
-+option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
-+option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
-
- if (BUILD_SHARED_LIBS)
- option(BUILD_STATIC "Build static library" ON)
- endif (BUILD_SHARED_LIBS)
-
-+string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
-+if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
-+ CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
-+ CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
-+ if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
-+ else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
-+ endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
-+
- configure_file(
- uchardet.pc.in
- uchardet.pc
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r1.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r1.ebuild
deleted file mode 100644
index 408937d901e..00000000000
--- a/app-i18n/uchardet/uchardet-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An encoding detector library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
-
-LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~x86"
-IUSE="cpu_flags_x86_sse2 static-libs test"
-
-PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision.patch" )
-
-src_prepare() {
- cmake-utils_src_prepare
- use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_STATIC=$(usex static-libs)
- -DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
- )
- cmake-utils_src_configure
-}
diff --git a/app-i18n/uchardet/uchardet-0.0.6.ebuild b/app-i18n/uchardet/uchardet-0.0.6.ebuild
deleted file mode 100644
index fc32c0008b4..00000000000
--- a/app-i18n/uchardet/uchardet-0.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An encoding detector library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
-
-LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86"
-IUSE="static-libs test"
-
-src_prepare() {
- cmake-utils_src_prepare
- use test || cmake_comment_add_subdirectory test
-
- # Remove flaky test. See Gentoo bug 631852.
- # Track https://bugs.freedesktop.org/show_bug.cgi?id=101033
- rm test/th/tis-620.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_STATIC=$(usex static-libs)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/
@ 2021-02-27 17:50 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-02-27 17:50 UTC (permalink / raw
To: gentoo-commits
commit: cb12e0cf8b9d460522cfd9c6f8369a3da4253ea0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 17:44:54 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 17:44:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb12e0cf
app-i18n/uchardet: Drop 0.0.6-r2
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-i18n/uchardet/Manifest | 1 -
...det-0.0.6-enforce-IEEE-float-precision-r1.patch | 59 ----------------------
app-i18n/uchardet/uchardet-0.0.6-r2.ebuild | 32 ------------
3 files changed, 92 deletions(-)
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 6d0131253a3..1b6998d1aad 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,2 +1 @@
-DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
deleted file mode 100644
index 2bc4977a5f0..00000000000
--- a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Add configuration option to enable SSE2.
-Add -ffloat-store flag on x86 without SSE2.
-
-Gentoo bug: https://bugs.gentoo.org/631852
-Gentoo bug: https://bugs.gentoo.org/641716
-Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
-
-This patch is an aggregation of the following upstream commits:
-5996bbd995aed5045cc22e4d1fab08c989377983
-77bf71ea365a19ac55c59cf10399b566a02d82c1
-939482ab2b5a6585bdd2e5251f3f2f113d64686f
-cd617d181de03a7a13c2020e6c73cd14585e24b6
-f136d434f0809e064ac195b5bc4e0b50484a474c
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9a699e..d140a24 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,6 @@
- ######## Project settings
- cmake_minimum_required(VERSION 2.8.5)
-+include(CheckCCompilerFlag)
- set (PACKAGE_NAME uchardet)
- project (${PACKAGE_NAME} CXX C)
- enable_testing()
-@@ -33,13 +34,31 @@ include(GNUInstallDirs)
-
- ######## Configuration
-
--option(BUILD_BINARY "Build executable" ON)
--option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
-+option(BUILD_BINARY "Build the CLI tool." ON)
-+option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
-+option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
-+set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.")
-
- if (BUILD_SHARED_LIBS)
- option(BUILD_STATIC "Build static library" ON)
- endif (BUILD_SHARED_LIBS)
-
-+if (TARGET_ARCHITECTURE STREQUAL "")
-+ string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
-+endif (TARGET_ARCHITECTURE STREQUAL "")
-+
-+if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
-+ CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
-+ CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
-+ if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
-+ else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
-+ endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
-+endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
-+
- configure_file(
- uchardet.pc.in
- uchardet.pc
diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
deleted file mode 100644
index da7d6a5567b..00000000000
--- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An encoding detector library"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
-SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
-
-LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="cpu_flags_x86_sse2 static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
-
-src_prepare() {
- cmake-utils_src_prepare
- use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
- local mycmakeargs=(
- -DTARGET_ARCHITECTURE="${ARCH}"
- -DBUILD_STATIC=$(usex static-libs)
- -DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-27 17:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-17 10:55 [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-02-27 17:50 Andreas Sturmlechner
2018-01-21 20:56 Thomas Deutschmann
2017-11-19 14:32 David Seifert
2017-04-10 9:16 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox