summaryrefslogtreecommitdiff
path: root/dev-db/sqlitebrowser
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/sqlitebrowser')
-rw-r--r--dev-db/sqlitebrowser/Manifest3
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch13
-rw-r--r--dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild4
3 files changed, 19 insertions, 1 deletions
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 912b7263fa30..258ca51d8fdc 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,5 @@
+AUX sqlitebrowser-3.12.2-str-conflict-fix.patch 392 BLAKE2B 95e4f5fac505e80ed9efcf8288d286ba4c49f719c9321abf1dddd7db72ce233f256398fa464e82899c7ede6f8bec37f72ffd36df1d5bb7a0476778c2d29651ac SHA512 7d721cc1a5d7c9b65a5ef2929cb57bbf34a87bda958c6b9b5f04615cc17f55ab6b047b68ea200bd1cd9068440d6d70d04d1127ab0c86754778b1a6ca7753c811
DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f
-EBUILD sqlitebrowser-3.12.2-r2.ebuild 1479 BLAKE2B 55661f5aba8603bea10b003078982dc0d22cbc7038eb3222b1bc0dd8fe5138d5e974cc532f1636b95c29241089e0764227858a492c3e2fe75fc38eca9bc11fbf SHA512 d239d66fd47c4174ccec551e0c30fff4900c5e9014e20b9d4fd8ff69e91b5c69244f113e427f0191cc690891d766869cb4adf5bb96f96cbc17053abdd6bcd9cc
+EBUILD sqlitebrowser-3.12.2-r2.ebuild 1535 BLAKE2B 3fe27ae93a14ab60a885d606e80098544a4116fa292b6514507d43b278fd8aa959cb9ef7ee8d60780cf0fc66a3cc6ee1afa4c5feac9502b193ad8c969b5694f6 SHA512 cd37dba1e4a630a864c5813af65517bd75baa0e74752f10f6ecc3fea0bc1b9fa53b530d1586aef08fb226275aedc79a17971d73b3e68a9e40122069b39c8ec2a
EBUILD sqlitebrowser-9999.ebuild 1479 BLAKE2B 55661f5aba8603bea10b003078982dc0d22cbc7038eb3222b1bc0dd8fe5138d5e974cc532f1636b95c29241089e0764227858a492c3e2fe75fc38eca9bc11fbf SHA512 d239d66fd47c4174ccec551e0c30fff4900c5e9014e20b9d4fd8ff69e91b5c69244f113e427f0191cc690891d766869cb4adf5bb96f96cbc17053abdd6bcd9cc
MISC metadata.xml 1796 BLAKE2B 988ec79d4d043ecbf8802aa3d761868479fc0a398a00035c387aa4b362e2c6c59afbbd04d648d2084aa0d9d35972336cd312c4b596e663e5142ce72671e70a55 SHA512 6b0e05517590c7c56cabc1bfecfafed155be78ccff4d159fd810b3c8e6555559c45fba3ea3bdf0aef73d1c1a1d8fcabc7005c2e7dbb3b6377d14505c819355d7
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
new file mode 100644
index 000000000000..07284ca8ba0c
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch
@@ -0,0 +1,13 @@
+--- a/src/version.h
++++ b/src/version.h
+@@ -4,8 +4,8 @@
+ #define MINOR_VERSION 12
+ #define PATCH_VERSION 2
+
+-#define str(s) #s
+-#define xstr(s) str(s)
++#define stringize(s) #s
++#define xstr(s) stringize(s)
+ #define APP_VERSION xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(PATCH_VERSION)
+
+ // If it is defined by the compiler, then it is a nightly build, and in the YYYYMMDD format.
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
index 47ce7cb6cacc..0b6665b1dd80 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
@@ -46,6 +46,10 @@ RDEPEND="
>=dev-qt/qtsvg-5.5:5
"
+PATCHES=(
+ "${FILESDIR}/${P}-str-conflict-fix.patch"
+)
+
src_prepare() {
cmake_src_prepare