Compare commits
250 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc924261ff | ||
| 5dffd1849e | |||
| ba82ac338c | |||
| e4894beee7 | |||
| 6176cc2215 | |||
| 43bba7e06c | |||
| 267b90675f | |||
| 4c4ae49beb | |||
| cdc09c2982 | |||
| 9116073bdd | |||
| c83f230ede | |||
| 605f6d9d9b | |||
|
|
8eb4c5323c | ||
| 37990c12b5 | |||
| 1bd55cd0ca | |||
| a3ae671314 | |||
| 195d162f40 | |||
| 60928ecf3a | |||
| 0c4963c18d | |||
| 3a7c520198 | |||
| eb58a1e670 | |||
| 1d65f57e88 | |||
| f42b704706 | |||
| 9f9b229e71 | |||
|
|
3ed91dd225 | ||
| 144ae3e022 | |||
| 61e8f93b85 | |||
| 49b7241bcc | |||
| cff03ab96b | |||
| ac08a54ba5 | |||
| f029fb5902 | |||
| 390ffb1d98 | |||
| 50d2b06238 | |||
| 110a255366 | |||
| b0ceed7732 | |||
| e88fe2d440 | |||
| 81a688a74b | |||
| a516dd9425 | |||
| 93d2a9fc1c | |||
| 5b6addc0e2 | |||
| a4e8bd5c93 | |||
| dd495599cd | |||
|
|
563a61f2f5 | ||
| 57c1da9836 | |||
| e56b1f903c | |||
| 8839d959f5 | |||
| 95fdced92f | |||
| d8f2467479 | |||
| 98b1b0553d | |||
| 1d718d7bcc | |||
| b4ac1abcc4 | |||
| 8c174c0b14 | |||
| 5411b57830 | |||
| c3e0829475 | |||
| 6bab63f3e0 | |||
| 438e8e572d | |||
| 03ac4e8cf5 | |||
| 0cd8e3014c | |||
| 17ba7b9d72 | |||
| 69ea5af6f8 | |||
| 524e9fc9fc | |||
| c7a96bffcd | |||
| 835f147f1e | |||
| bbfd42885e | |||
| 0a29b48343 | |||
| 5f26df7d50 | |||
| c6442e6062 | |||
| e07f0f8453 | |||
| 749d077932 | |||
| 71d2ecd31d | |||
|
|
94b9080545 | ||
| 864d0f026c | |||
| cebdb5daee | |||
|
|
233d689018 | ||
| 930bbba591 | |||
| 0e9f13f685 | |||
| 37f6ae8cfa | |||
| 00d2e4faf7 | |||
| ccc5acfc72 | |||
| 8c592bd9ad | |||
| 4de88e7c3e | |||
| 139fcd0c8b | |||
| d05856b45e | |||
| ef2e34c456 | |||
| 7d86e78874 | |||
| f3503e9092 | |||
| 622ea0765d | |||
| 423560fec2 | |||
| 23f5912b63 | |||
| 4d7af6278d | |||
| 1d5381a0cd | |||
| 6dd3f522c9 | |||
| 7de6be87f5 | |||
| eb21671a16 | |||
| 839f7de36c | |||
| 618c3c598f | |||
| a7f4160c72 | |||
| f148e6499d | |||
| 3db81a8cd1 | |||
| af27172845 | |||
| abe2770a16 | |||
| fd941ec633 | |||
| ba31dbb9f5 | |||
| aaa32b298d | |||
| 85bfb7df6b | |||
| deb61352c3 | |||
| c9da3deb9e | |||
| 24ddc5a4cf | |||
| cd37db4ecf | |||
| b3723b57ff | |||
| 8ceb101344 | |||
|
|
ec49aefe34 | ||
| 589ef96127 | |||
| 6f1d080839 | |||
| caec8d00ed | |||
| c9c0462415 | |||
| fc7986741b | |||
|
|
29efe89258 | ||
| 658268b60d | |||
| 391a406168 | |||
| 67caa890e4 | |||
| 588eb29206 | |||
| 322aa2b44f | |||
| 2125534611 | |||
| fb52639534 | |||
| 8582db4414 | |||
| f4f2595008 | |||
| 6ae414f266 | |||
| 031c430a87 | |||
| 07f6f0215e | |||
| e13c0d34f1 | |||
| d2f1f1a556 | |||
| 6d609885e8 | |||
| 1a6bbd873a | |||
| 348d95728c | |||
| 5e7dc24fbd | |||
| 8e0c285278 | |||
| fbf33ee3af | |||
| 94ddda1647 | |||
| d58d3b82bd | |||
| af9eaf44c3 | |||
| a7cec8d6b8 | |||
| 653bf8bbc4 | |||
| 938734c0cf | |||
| 79f20749d0 | |||
| cf3c562c2c | |||
| 5c1c99b011 | |||
| 527ad7687d | |||
| bec7463633 | |||
| d34a0893df | |||
| 26a61a7e5d | |||
| 25ae521acb | |||
|
|
a0006a7c80 | ||
| c21145bd86 | |||
| 44bf68bd1e | |||
| d601effcbe | |||
| b867249ea2 | |||
| 84fc2d2328 | |||
| d437060289 | |||
| 9e4d78cda3 | |||
| b7522c6a3b | |||
| ef9743f3eb | |||
| 887b4c2879 | |||
| 9873f7c6d7 | |||
| 2b391043cd | |||
| b62f7dd383 | |||
| 3376856335 | |||
| 1f9801258d | |||
| 300509d406 | |||
| 8740da851c | |||
| ac3c98d1af | |||
| 457fee445b | |||
| 514802d6b5 | |||
| dc6b5f9f40 | |||
| 71f89919d0 | |||
| dfcd456953 | |||
| 37142f08cb | |||
| a32efa91f4 | |||
| 0ac17c3d5d | |||
| 81365732eb | |||
| 557129664f | |||
| fb66ae229f | |||
| c4ecd10fc4 | |||
| 152feacd6a | |||
| 9e20a41179 | |||
| 2ee389508c | |||
| b362468734 | |||
| 7bbaab3af1 | |||
| 7e66b1e8c6 | |||
| 380681eb88 | |||
|
|
84b119a497 | ||
| 775305308a | |||
| 73b4d8fd80 | |||
| 34596d613a | |||
| 63105dcab9 | |||
| 923a41882c | |||
| 194e3ff37a | |||
| 08ddfa054e | |||
| 1b8d9e9afd | |||
| e1daf87683 | |||
| b9d0ad5487 | |||
| d619de7fb1 | |||
| 47610e5277 | |||
| 5d2d72db1b | |||
| 953d749a16 | |||
| 75637dcb48 | |||
| 2660b6058d | |||
| 7709a6aba1 | |||
| 1e1df46a89 | |||
| e031cb6ac4 | |||
| 72aa0c7a5f | |||
| 30b660b7a9 | |||
| 574a49913a | |||
| a16da00b9c | |||
| 2690ed1a81 | |||
| 4ce47b9bb2 | |||
| 18bd31432e | |||
| 87d720909c | |||
| 7f090e2728 | |||
| a29b31695a | |||
| d74508acd1 | |||
| 71259a1e89 | |||
| 197cdc7ab9 | |||
| 8521e4db66 | |||
| 6841d031ab | |||
| fff4d688a0 | |||
| b009e4c729 | |||
| 90046950b4 | |||
| 2d4ef500c4 | |||
| d607935875 | |||
| ada6f95818 | |||
| 9a6be4b5cd | |||
| 13833765d6 | |||
| c124c55d15 | |||
| eb82e42928 | |||
| 28fe6de5ce | |||
| 32aa0ba625 | |||
| 977e905d7f | |||
| 41fe79e892 | |||
| 61005e29a2 | |||
| 87f4563aed | |||
| fd9009297a | |||
| af53e3498c | |||
| bc7a2e673e | |||
| b2d927b8da | |||
| 875b96a356 | |||
| 2cd3a253ad | |||
| 5020b6856a | |||
| b15aa200c0 | |||
| 545662aa88 |
7 changed files with 142 additions and 256 deletions
142
.gitignore
vendored
142
.gitignore
vendored
|
|
@ -1,141 +1 @@
|
|||
jd-2.7.0-svn3593_trunk.tgz
|
||||
jd-2.7.0-svn3600_trunk.tgz
|
||||
jd-2.7.0-beta100808.tgz
|
||||
jd-2.7.0-svn3613_trunk.tgz
|
||||
/jd-2.7.0-rc100818.tgz
|
||||
/jd-2.7.0-100823.tgz
|
||||
/jd-2.7.5-svn3645_trunk.tgz
|
||||
/jd-2.7.5-svn3663_trunk.tgz
|
||||
/jd-2.7.5-svn3665_trunk.tgz
|
||||
/jd-2.7.5-svn3669_trunk.tgz
|
||||
/jd-2.7.5-svn3673_trunk.tgz
|
||||
/jd-2.7.5-svn3680_trunk.tgz
|
||||
/jd-2.7.5-svn3686_trunk.tgz
|
||||
/jd-2.7.5-svn3688_trunk.tgz
|
||||
/jd-2.7.5-svn3692_trunk.tgz
|
||||
/jd-2.7.5-svn3700_trunk.tgz
|
||||
/jd-2.7.5-svn3717_trunk.tgz
|
||||
/jd-2.7.5-svn3722_trunk.tgz
|
||||
/jd-2.7.5-svn3731_trunk.tgz
|
||||
/jd-2.7.5-svn3739_trunk.tgz
|
||||
/jd-2.7.5-svn3741_trunk.tgz
|
||||
/jd-2.7.5-svn3749_trunk.tgz
|
||||
/jd-2.7.5-svn3754_trunk.tgz
|
||||
/jd-2.7.5-svn3757_trunk.tgz
|
||||
/jd-2.7.5-beta101213.tgz
|
||||
/jd-2.7.5-svn3779_trunk.tgz
|
||||
/jd-2.7.5-svn3783_trunk.tgz
|
||||
/jd-2.7.5-101228.tgz
|
||||
/jd-2.8.0-svn3800_trunk.tgz
|
||||
/jd-2.8.0-svn3806_trunk.tgz
|
||||
/jd-2.8.0-svn3810_trunk.tgz
|
||||
/jd-2.8.0-beta110118.tgz
|
||||
/jd-2.8.0-rc110129.tgz
|
||||
/jd-2.8.0-110203.tgz
|
||||
/jd-2.8.1-svn3838_trunk.tgz
|
||||
/jd-2.8.1-svn3840_trunk.tgz
|
||||
/jd-2.8.1-svn3841_trunk.tgz
|
||||
/jd-2.8.1-svn3842_trunk.tgz
|
||||
/jd-2.8.1-beta110214.tgz
|
||||
/jd-2.8.1-svn3852_trunk.tgz
|
||||
/jd-2.8.1-svn3856_trunk.tgz
|
||||
/jd-2.8.1-svn3859_trunk.tgz
|
||||
/jd-2.8.1-svn3864_trunk.tgz
|
||||
/jd-2.8.1-110312.tgz
|
||||
/jd-2.8.2-svn3876_trunk.tgz
|
||||
/jd-2.8.2-svn3882_trunk.tgz
|
||||
/jd-2.8.2-svn3885_trunk.tgz
|
||||
/jd-2.8.2-svn3887_trunk.tgz
|
||||
/jd-2.8.2-svn3895_trunk.tgz
|
||||
/jd-2.8.2-svn3898_trunk.tgz
|
||||
/jd-2.8.2-svn3901_trunk.tgz
|
||||
/jd-2.8.2-svn3903_trunk.tgz
|
||||
/jd-2.8.2-svn3905_trunk.tgz
|
||||
/jd-2.8.2-svn3907_trunk.tgz
|
||||
/jd-2.8.2-svn3909_trunk.tgz
|
||||
/jd-2.8.2-svn3914_trunk.tgz
|
||||
/jd-2.8.2-svn3916_trunk.tgz
|
||||
/jd-2.8.2-svn3920_trunk.tgz
|
||||
/jd-2.8.2-svn3924_trunk.tgz
|
||||
/jd-2.8.2-svn3925_trunk.tgz
|
||||
/jd-2.8.2-beta110724.tgz
|
||||
/jd-2.8.2-rc11083.tgz
|
||||
/jd-2.8.2-110808.tgz
|
||||
/jd-2.8.5-svn3963_trunk.tgz
|
||||
/jd-2.8.5-svn3973_trunk.tgz
|
||||
/jd-2.8.5-svn3974_trunk.tgz
|
||||
/jd-2.8.5-svn3982_trunk.tgz
|
||||
/jd-2.8.5-svn3993_trunk.tgz
|
||||
/jd-2.8.5-beta120206.tgz
|
||||
/jd-2.8.5-svn4017_trunk.tgz
|
||||
/jd-2.8.5-svn4020_trunk.tgz
|
||||
/jd-2.8.5-rc120811.tgz
|
||||
/jd-2.8.5-120826.tgz
|
||||
/jd-2.8.6-svn4051_trunk.tgz
|
||||
/jd-2.8.6-svn4054_trunk.tgz
|
||||
/jd-2.8.6-svn4072_trunk.tgz
|
||||
/jd-2.8.6-svn4076_trunk.tgz
|
||||
/jd-2.8.6-svn4077_trunk.tgz
|
||||
/jd-2.8.6-svn4079_trunk.tgz
|
||||
/jd-2.8.6-svn4081_trunk.tgz
|
||||
/jd-2.8.6-svn4087_trunk.tgz
|
||||
/jd-2.8.6-svn4089_trunk.tgz
|
||||
/jd-2.8.6-svn4090_trunk.tgz
|
||||
/jd-2.8.6-svn4096_trunk.tgz
|
||||
/jd-2.8.6-beta130304.tgz
|
||||
/jd-2.8.6-svn4105_trunk.tgz
|
||||
/jd-2.8.6-svn4107_trunk.tgz
|
||||
/jd-2.8.6-svn4109_trunk.tgz
|
||||
/jd-2.8.6-rc130414.tgz
|
||||
/jd-2.8.6-130518.tgz
|
||||
/jd-2.8.7-svn4128_trunk.tgz
|
||||
/jd-2.8.7-svn4132_trunk.tgz
|
||||
/jd-2.8.7-rc131230.tgz
|
||||
/jd-2.8.7-140104.tgz
|
||||
/jd-2.8.8-svn4151_trunk.tgz
|
||||
/jd-2.8.8-svn4152_trunk.tgz
|
||||
/jd-2.8.8-beta140329.tgz
|
||||
/jd-2.8.8-svn4166_trunk.tgz
|
||||
/jd-2.8.8-svn4171_trunk.tgz
|
||||
/jd-2.8.8-rc140429.tgz
|
||||
/jd-2.8.8-140601.tgz
|
||||
/jd-2.8.9-svn4193_trunk.tgz
|
||||
/jd-2.8.9-rc150201.tgz
|
||||
/jd-2.8.9-svn4207_trunk.tgz
|
||||
/jd-2.8.9-150226.tgz
|
||||
/JD-20180217T2310.tar.gz
|
||||
/JD-20180502T1630.tar.gz
|
||||
/JDim-20200131T1441.tar.gz
|
||||
/JDim-20200203T1247.tar.gz
|
||||
/JDim-20200811T1400.tar.gz
|
||||
/JDim-20201022T1107.tar.gz
|
||||
/JDim-20201027T1619.tar.gz
|
||||
/JDim-20201105T2232.tar.gz
|
||||
/JDim-20201125T1203.tar.gz
|
||||
/JDim-20201220T1610.tar.gz
|
||||
/JDim-20201231T1019.tar.gz
|
||||
/JDim-20210110T1542.tar.gz
|
||||
/JDim-20210503T1359.tar.gz
|
||||
/JDim-20210711T1551.tar.gz
|
||||
/JDim-20211017T1447.tar.gz
|
||||
/JDim-20211018T0932.tar.gz
|
||||
/JDim-20211023T2303.tar.gz
|
||||
/JDim-20211025T0926.tar.gz
|
||||
/JDim-20211030T2337.tar.gz
|
||||
/JDim-20211101T0959.tar.gz
|
||||
/JDim-20211104T2328.tar.gz
|
||||
/JDim-20211107T1159.tar.gz
|
||||
/JDim-20211108T0913.tar.gz
|
||||
/JDim-20211114T0025.tar.gz
|
||||
/JDim-20211115T1946.tar.gz
|
||||
/JDim-20211123T0006.tar.gz
|
||||
/JDim-20211129T1614.tar.gz
|
||||
/JDim-20211212T0912.tar.gz
|
||||
/JDim-20211214T1124.tar.gz
|
||||
/JDim-20211219T0901.tar.gz
|
||||
/JDim-20211221T1632.tar.gz
|
||||
/JDim-20211223T1411.tar.gz
|
||||
/JDim-20211226T1534.tar.gz
|
||||
/JDim-20220106T1448.tar.gz
|
||||
/JDim-20220109T2216.tar.gz
|
||||
/JDim-20220116T2221.tar.gz
|
||||
/JDim-*.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
From 01cff84b8ea1221c3bd0a2f3017b75fc79ba823a Mon Sep 17 00:00:00 2001
|
||||
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
||||
Date: Fri, 31 Jan 2020 20:51:09 +0900
|
||||
Subject: [PATCH 07/11] MISC::remove_space: handle the case str consists of
|
||||
just spaces (#176)
|
||||
|
||||
In the funcion MISC::remove_space , when the input str consists of just spaces,
|
||||
the current implementation causes invalid access against str because
|
||||
the variable i2 can be (size_t)-1.
|
||||
When compiled with -Wp,-D_GLIBCXX_ASSERTIONS, this actually causes abort like:
|
||||
|
||||
/usr/include/c++/9/bits/basic_string.h:1048: std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::const_reference std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::operator[](std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::size_type) const [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::const_reference = const char&; std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::size_type = long unsigned int]: Assertion '__pos <= size()' failed.
|
||||
|
||||
Note that for this case, i finally becomes lng (== str.length()), and
|
||||
str.substr(pos, len) returns empty string when pos == str.length(), so
|
||||
this patch should behave as the previous behavior.
|
||||
---
|
||||
src/jdlib/miscutil.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/jdlib/miscutil.cpp b/src/jdlib/miscutil.cpp
|
||||
index a7d3dd34..ccd71e45 100644
|
||||
--- a/src/jdlib/miscutil.cpp
|
||||
+++ b/src/jdlib/miscutil.cpp
|
||||
@@ -304,7 +304,7 @@ std::string MISC::remove_space( const std::string& str )
|
||||
|
||||
// 前
|
||||
size_t i = 0;
|
||||
- while( 1 ){
|
||||
+ while( i < lng ){
|
||||
|
||||
// 半角
|
||||
if( str[ i ] == ' ' ) ++i;
|
||||
@@ -315,6 +315,7 @@ std::string MISC::remove_space( const std::string& str )
|
||||
str[ i +2 ] == str_space[ 2 ] ) i += lng_space;
|
||||
else break;
|
||||
}
|
||||
+ if (i >= lng) return "";
|
||||
|
||||
// 後
|
||||
size_t i2 = lng -1;
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ mkdir TMP
|
|||
pushd TMP
|
||||
git clone ../${REPONAME}.git
|
||||
cd ${REPONAME}
|
||||
git log 2>&1 | head -n 5
|
||||
git log 2>&1 | head -n 10
|
||||
#grep version README.md
|
||||
echo
|
||||
popd
|
||||
|
|
|
|||
196
jd.spec
196
jd.spec
|
|
@ -11,41 +11,43 @@
|
|||
##########################################
|
||||
# Defined by upsteam
|
||||
#
|
||||
%define main_ver 0.7.0
|
||||
%define main_ver 0.17.0
|
||||
#%%define strtag 20200118
|
||||
%dnl %define pre_ver beta
|
||||
##########################################
|
||||
#
|
||||
%global reponame JDim
|
||||
%global gitdate 20220108
|
||||
%global gitcommit 49aaaa784f06c758c6a46faaf1a2641a9bfd1c61
|
||||
#%%global gitcommit JDim-v%{main_ver}
|
||||
%global gitdate 20260711
|
||||
%global gitcommit 3d20eba5565e8c7b2bf70aaaad3d5b97794c66e0
|
||||
%dnl %global gitcommit JDim-v%{main_ver}
|
||||
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
|
||||
|
||||
%global tarballdate 20220116
|
||||
%global tarballtime 2221
|
||||
%global tarballdate 20260711
|
||||
%global tarballtime 2130
|
||||
|
||||
##########################################
|
||||
# Defined by vendor
|
||||
#
|
||||
%define vendor_rel 1
|
||||
%define extra_rel %{nil}
|
||||
%define use_gitcommit_as_rel 0
|
||||
# Tag name changed from vendor to vendorname so as not to
|
||||
# overwrite Vendor entry in Summary
|
||||
%define vendorname fedora
|
||||
%define gtkmmdevel pkgconfig(gtkmm-3.0)
|
||||
%define fontpackage mona-fonts-VLGothic
|
||||
##########################################
|
||||
|
||||
##########################################
|
||||
%if 0%{?use_gitcommit_as_rel} >= 1
|
||||
%global rel %{vendor_rel}.D%{gitdate}git%{shortcommit}%{?dist}
|
||||
%global gittag %{gitdate}git%{shortcommit}
|
||||
%global gitver_rpm ^%{gittag}
|
||||
%global gitver_build -%{gittag}
|
||||
%else
|
||||
%define rel %{vendor_rel}%{?dist}
|
||||
%global gittag %{nil}
|
||||
%global gitver_rpm %{nil}
|
||||
%global gitver_build %{nil}
|
||||
%endif
|
||||
|
||||
%define _with_migemo 1
|
||||
%define _with_onig 0
|
||||
%define migemo_dict %{_datadir}/cmigemo/utf-8/migemo-dict
|
||||
|
||||
%if ! 0%{?fedora}
|
||||
|
|
@ -65,27 +67,28 @@
|
|||
%endif
|
||||
|
||||
#%%undefine _annotated_build
|
||||
%if 0%{?use_gitcommit_as_rel} >= 1
|
||||
%global clamp_mtime_to_source_date_epoch 0
|
||||
%endif
|
||||
##########################################
|
||||
|
||||
|
||||
Name: jd
|
||||
Epoch: 1
|
||||
Version: %{main_ver}%{?strtag:.%{strtag}}
|
||||
Release: %{rel}%{flagrel}
|
||||
Version: %{main_ver}%{?strtag:.%{strtag}}%{?pre_ver:~%{pre_ver}}%{gitver_rpm}
|
||||
Release: 2%{?dist}%{flagrel}
|
||||
Summary: A 2ch browser
|
||||
|
||||
License: GPLv2
|
||||
# Automatically converted from old format: GPLv2 - review is highly recommended.
|
||||
License: GPL-2.0-only
|
||||
URL: https://github.com/JDimproved/JDim
|
||||
|
||||
#Source0: http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
|
||||
%dnl Source0: http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
|
||||
Source0: JDim-%{tarballdate}T%{tarballtime}.tar.gz
|
||||
Source1: create-JD-git-bare-tarball.sh
|
||||
|
||||
Patch0: jdim-0.3.0-env-pkg-distro-specific.patch
|
||||
# Upstream patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: %{gtkmmdevel}
|
||||
BuildRequires: pkgconfig(gtkmm-3.0)
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libxcrypt-devel
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
|
|
@ -96,12 +99,9 @@ BuildRequires: pkgconfig(sm)
|
|||
%if 0%{?_with_migemo} >= 1
|
||||
BuildRequires: cmigemo-devel
|
||||
%endif
|
||||
%if 0%{?_with_onig} >= 1
|
||||
BuildRequires: oniguruma-devel
|
||||
%endif
|
||||
|
||||
BuildRequires: libtool automake
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: meson
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: %{_bindir}/appstream-util
|
||||
BuildRequires: %{_bindir}/desktop-file-validate
|
||||
BuildRequires: git
|
||||
|
|
@ -119,39 +119,33 @@ Requires: %{fontpackage}
|
|||
JD is a 2ch browser based on gtkmm2.
|
||||
|
||||
%prep
|
||||
%setup -q -c -T -a 0
|
||||
%setup -q -c -T -n %{name}-%{main_ver}%{?strtag:.%{strtag}}%{gitver_build} -a 0
|
||||
|
||||
git clone ./%{reponame}.git
|
||||
cd JDim
|
||||
|
||||
git config user.name "%{name} Fedora maintainer"
|
||||
git config user.email "%{name}-owner@fedoraproject.org"
|
||||
git config user.email "%{name}-maintainers@fedoraproject.org"
|
||||
|
||||
%if 0%{?use_gitcommit_as_rel} >= 1
|
||||
git checkout -b %{version}-fedora-local %{gitcommit}
|
||||
git checkout -b %{main_ver}-fedora-local %{gitcommit}
|
||||
%else
|
||||
git checkout -b %{version}-fedora-local %{reponame}-v%{main_ver}
|
||||
git checkout -b %{main_ver}-fedora-local %{gitcommit}
|
||||
#git checkout -b %{main_ver}-fedora-local %{reponame}-v%{main_ver}
|
||||
%endif
|
||||
|
||||
cp -a [A-Z]* ..
|
||||
|
||||
# Fedora specific
|
||||
if ( uname -n | grep -q 'fedoraproject\.org' ) ; then
|
||||
%patch0 -p2 -b .env_fedora
|
||||
git commit -m "apply Fedora specific config" -a
|
||||
fi
|
||||
|
||||
# reset to base, as git information is embedded in the source
|
||||
git checkout -b %{version}-fedora
|
||||
git checkout -b %{main_ver}-fedora
|
||||
#git reset %{reponame}-v%{main_ver}
|
||||
%if 0%{?use_gitcommit_as_rel} >= 1
|
||||
git reset %{gitcommit}
|
||||
%else
|
||||
git reset %{reponame}-v%{main_ver}
|
||||
git reset %{gitcommit}
|
||||
#git reset %{reponame}-v%{main_ver}
|
||||
%endif
|
||||
|
||||
autoreconf -i
|
||||
|
||||
%build
|
||||
cd %{reponame}
|
||||
|
||||
|
|
@ -159,38 +153,36 @@ cd %{reponame}
|
|||
export TZ='Asia/Tokyo'
|
||||
|
||||
%set_build_flags
|
||||
# workaround for calling crypt_r / linking -lcrypt issue with asan
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1827338
|
||||
# https://github.com/google/sanitizers/issues/1365
|
||||
export LDFLAGS="$LDFLAGS -Wl,--push-state,--no-as-needed -lcrypt -Wl,--pop-state"
|
||||
|
||||
%if 0%{?use_gcc_strict_sanitize}
|
||||
export CC="${CC} -fsanitize=address -fsanitize=undefined"
|
||||
export CXX="${CXX} -fsanitize=address -fsanitize=undefined"
|
||||
export LDFLAGS="${LDFLAGS} -pthread"
|
||||
|
||||
# Currently -fPIE binary cannot work with ASAN on kernel 4.12
|
||||
# https://github.com/google/sanitizers/issues/837
|
||||
export CFLAGS="$(echo $CFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')"
|
||||
export CXXFLAGS="$(echo $CXXFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')"
|
||||
export LDFLAGS="$(echo $LDFLAGS | sed -e 's|-specs=[^ \t][^ \t]*hardened[^ \t][^ \t]*||g')"
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--with-alsa \
|
||||
%if 0%{?_with_onig} >= 1
|
||||
--with-regex=oniguruma \
|
||||
%endif
|
||||
--with-xdgopen \
|
||||
%meson \
|
||||
-Dalsa=enabled \
|
||||
-Dbuild_tests=enabled \
|
||||
-Dcompat_cache_dir=enabled \
|
||||
%if 0%{?_with_migemo} >= 1
|
||||
--with-migemo \
|
||||
--with-migemodict=%{migemo_dict} \
|
||||
-Dmigemo=enabled \
|
||||
-Dmigemodict=%{migemo_dict} \
|
||||
%endif
|
||||
%{nil}
|
||||
|
||||
%make_build -k
|
||||
-Dpackager="jd-%{version}-%{release}.%{_arch}.rpm by Fedora Project" \
|
||||
-Dtls=gnutls \
|
||||
%{nil}
|
||||
|
||||
%meson_build \
|
||||
--ninja-args "-k 0"
|
||||
|
||||
%install
|
||||
cd %{reponame}
|
||||
|
||||
%make_install
|
||||
%meson_install
|
||||
|
||||
# Create symlink
|
||||
ln -sf jdim %{buildroot}%{_bindir}/%{name}
|
||||
|
|
@ -200,11 +192,17 @@ ln -sf jdim.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|||
desktop-file-validate %{buildroot}%{_datadir}/applications/jdim.desktop
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/jdim.metainfo.xml
|
||||
|
||||
cd %{reponame}
|
||||
%if 0%{?use_gcc_strict_sanitize} >= 1
|
||||
export ASAN_OPTIONS=detect_leaks=0
|
||||
%endif
|
||||
%meson_test -v
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%license COPYING
|
||||
%doc ChangeLog README
|
||||
%doc ChangeLog
|
||||
%doc README.md
|
||||
%{_bindir}/jdim
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
|
|
@ -213,6 +211,90 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/jdim.metainfo.
|
|||
%{_datadir}/icons/hicolor/*/apps/jdim.*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jul 11 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.17.0-1
|
||||
- 0.17.0
|
||||
|
||||
* Tue Mar 17 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.16.0-1
|
||||
- 0.16.0
|
||||
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.15.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Sat Jan 10 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.15.0-1
|
||||
- 0.15.0
|
||||
|
||||
* Sun Jul 27 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.14.0-1
|
||||
- 0.14.0
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.13.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jan 11 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.13.0-1
|
||||
- 0.13.0
|
||||
|
||||
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 1:0.12.0-3
|
||||
- convert license to SPDX
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.12.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Jul 07 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.12.0-1
|
||||
- 0.12.0
|
||||
|
||||
* Tue Jun 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.12.0~beta-1
|
||||
- 0.12.0-beta
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jan 13 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.11.0-1
|
||||
- 0.11.0
|
||||
|
||||
* Sun Dec 24 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.11.0~beta-1
|
||||
- 0.11.0 beta
|
||||
|
||||
* Sun Jul 23 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.10.1-1
|
||||
- 0.10.1
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sun Jul 9 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.10.0-1
|
||||
- 0.10.0
|
||||
|
||||
* Mon Jun 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.10.0~beta-1
|
||||
- 0.10.0 beta
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.9.0-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jan 18 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.9.0-2
|
||||
- Add missing cstdint header inclusion (gcc13)
|
||||
|
||||
* Sun Jan 8 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.9.0-1
|
||||
- JDim 0.9.0
|
||||
|
||||
* Sun Dec 18 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.9.0-0.1.beta.D20221218git3f6cf65
|
||||
- 0.9.0 beta
|
||||
|
||||
* Wed Jul 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.8.0-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jul 18 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.8.0-1
|
||||
- JDim 0.8.0
|
||||
|
||||
* Sun Feb 06 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.7.0-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sun Jan 16 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.7.0-1
|
||||
- JDim 0.7.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- jd-0.3.0/JDim/src/environment.cpp.env_fedora 2020-01-31 14:58:08.306098160 +0900
|
||||
+++ jd-0.3.0/JDim/src/environment.cpp 2020-01-31 14:59:30.123024272 +0900
|
||||
@@ -619,7 +619,7 @@ std::string ENVIRONMENT::get_jdinfo()
|
||||
jd_info <<
|
||||
"[バージョン] " << progname << " " << version << "\n" <<
|
||||
"[ディストリ ] " << distribution << "\n" <<
|
||||
- "[パッケージ] " << "バイナリ/ソース( <配布元> )" << "\n" <<
|
||||
+ "[パッケージ] " << "Fedora Project配布のバイナリrpm" << "\n" <<
|
||||
"[ DE/WM ] " << desktop << "\n" <<
|
||||
"[ gtkmm ] " << get_gtkmm_version() << "\n" <<
|
||||
"[ glibmm ] " << get_glibmm_version() << "\n" <<
|
||||
|
|
@ -1 +0,0 @@
|
|||
Check svn later
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (JDim-20220116T2221.tar.gz) = f2cec0020f4fd21a9fec99e29bf4a1cb56d13bbc2b480c13e08e8861cc8802558b4b714849496f7ef96c9265fcc6df853cb00aab500425abe1392def3c1132eb
|
||||
SHA512 (JDim-20260711T2130.tar.gz) = a57175354ab09926aa7186de1a7f0580d31f5c4a3fef93ceb6946429b6f117dda2bc34095a09711a8c39341de4542b6199959b02a6cce30bea1d78b4d06ed41e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue