From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- media-radio/Manifest.gz | Bin 4859 -> 4855 bytes media-radio/cqrlog/Manifest | 2 + media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild | 41 +++++ .../2.3.0-database-connection-refactoring.patch | 197 +++++++++++++++++++++ media-radio/js8call/Manifest | 3 + .../files/0.8.0-makefile-removesymlink.patch | 15 ++ media-radio/js8call/js8call-0.8.0.ebuild | 54 ++++++ 7 files changed, 312 insertions(+) create mode 100644 media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild create mode 100644 media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch create mode 100644 media-radio/js8call/files/0.8.0-makefile-removesymlink.patch create mode 100644 media-radio/js8call/js8call-0.8.0.ebuild (limited to 'media-radio') diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz index 7de69dc283d2..3186337a73d8 100644 Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest index b7e546901c42..406e1f296c49 100644 --- a/media-radio/cqrlog/Manifest +++ b/media-radio/cqrlog/Manifest @@ -1,7 +1,9 @@ AUX 2.1.0-makefile.patch 523 BLAKE2B 8a0143b80422ee19a0bdf8637de065d3af6b4aded30e3437b8ff3b05b5704426e9f890d915ba5e50429ebba9f4f77da9b15865d6a3b8e8233976c0b165e8dd09 SHA512 26da9c578cab7f2fadebf6818f323967e28383fe3e2429d3ef614c43bcd50155bdf1607f353beedd91c27b45045dff1787ee9d2844ffa800f7da53e04b045de8 +AUX 2.3.0-database-connection-refactoring.patch 5985 BLAKE2B e4b68f4e0c9b91aadf6d052726573b3adcba0eede88f81abcc316197844a69bfc60b4377d3833546797ae6ec8a1191dcf5a9668bebb3e63b5dca2039bab8a8ba SHA512 25a3c0fe60dfd6ccac9ca30d82703b2a376c8f58fb09c696431431ffddd17ddc78b5094a60a459fe754598c1093cbed1ff8d6e66d5c6317d3bb2be757df76820 AUX 2.3.0-makefile.patch 531 BLAKE2B 8860b129afa97fc9c1d444e0356950afa554c25a2cab8bc508a319e5bb85d57df411ec5cf9e813de4b0991f79694b47070b6933e649c4bd32f44d2de4c4400b8 SHA512 a8c724ea250518d701bf0b458114caaee410463fbc954288d8127a743955cff133fb0064561b1a2fb7b077c66f667a1398cb053210b0b21cda3185638baafa7c DIST cqrlog-2.1.0.tar.gz 8732858 BLAKE2B 926934b70dcd53d48ed6443994a295efdee7e34d968337f409988f269fe01faeace5dbfa02307d04ba41fb72205925b9a56fa1f75472f018cd85a408edf1265a SHA512 df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e DIST cqrlog-2.3.0.tar.gz 10407716 BLAKE2B d932bb47601b42c940461343df69e82d8e7b8902a7cf959b72ab9a667cbaea1f8a829bfb6b3abfb2a9112f4aeed2adcbed825b1f347ceba640f1ad3903b0c246 SHA512 1e045d194a05248711e6ec43ec65e8f3f24e4fedab887cc89dc1ef6aa6e53ece4d923c9142a6ef89d8e1c46de678a16d108d344f005fa255d008cb9c5e482000 EBUILD cqrlog-2.1.0-r2.ebuild 931 BLAKE2B 2761e013d14817aeb3079ef7afe6c7cef0d11188558256848d9506d999aa7ba127ec5401b81de88058db80f69a1d862328a6327f83c34533d82ad9ea6717dcb8 SHA512 4817a6c632709b903be464a2f07206bf1b27ee3fbdbf4f9e2f6e3ac7943578da49d8f0521b6eb358f3c2de9e08a35b29cda4b92fdc73ae96573e87d11a692a8d +EBUILD cqrlog-2.3.0-r1.ebuild 888 BLAKE2B 620c1c07c29b9347f41a8a0266885fc5a1ac202322e1e1d3741e7eec448d7ccf1f8bde9388b1ce8e266db2ba39d88d1a26b965e101f90d9639504e6c6aceb888 SHA512 ee32b7466b65fd7e6c6160e52d947c1a2331604bc1c3eaf9ceb1c959261f187d62f662b5ba19a486cb1ce75a0e430b50bb74000638619304bfbb8394bd284919 EBUILD cqrlog-2.3.0.ebuild 951 BLAKE2B 1bd1f5a05104c7d05ede2175c289a478d5bcb71369c8593476899c592d23057865b19a9063324f2b13c11640a45ead03a3133321536d8fcf06d10604aae9c84b SHA512 f21a6559f3ac0dd2ee9c16fde8f34e768171d35cdf19b9aa86053aa97577784cffc3f1cfe0be433d36c1a1c287c1f15a59b979396dd88aa3ff3f896a39c1f78c MISC metadata.xml 213 BLAKE2B 968a2200bc028093589608429f0d0696f40ab32aa15b97320ea16e0a3769843a69537c5be4c96d6d95f83d49f75a133ef1d1be1419e1e88b86780aa7be036f58 SHA512 82ed61dc8b730a64e8265a7f341fe601880959c39efbd20fb923e980ca88bb07e8e5ed57d8ef677dfd519417fc2b2f5a9a72f91b32eecae6ca15a1a44f0c101c diff --git a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild b/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild new file mode 100644 index 000000000000..43d58b5490bd --- /dev/null +++ b/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database." +HOMEPAGE="https://www.cqrlog.com/" +SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-lang/lazarus-1.8.0 + >=dev-lang/fpc-3.0.2" + +RDEPEND="${DEPEND} + virtual/mysql[server] + dev-libs/atk + dev-libs/glib + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+ + x11-libs/libX11 + x11-libs/pango" + +LazarusDir=/usr/share/lazarus/ + +src_prepare() { + eapply_user + epatch "${FILESDIR}/${PV}-makefile.patch" + epatch "${FILESDIR}/${PV}-database-connection-refactoring.patch" +} + +pkg_postist() { + elog "This package optionally supports media-libs/hablib" + elog "for monitoring radio settings." +} diff --git a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch b/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch new file mode 100644 index 000000000000..810bc5b5ba97 --- /dev/null +++ b/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch @@ -0,0 +1,197 @@ +From b26102b097ef6353a20d18ccdaf7a3a6a30185c7 Mon Sep 17 00:00:00 2001 +From: ok2cqr +Date: Sat, 15 Sep 2018 07:12:30 +0200 +Subject: [PATCH] database connection refactoring + +--- + src/dData.pas | 126 +++++++------------------------------------------- + 1 file changed, 17 insertions(+), 109 deletions(-) + +diff --git a/src/dData.pas b/src/dData.pas +index 9d72d27..bb56598 100644 +--- a/src/dData.pas ++++ b/src/dData.pas +@@ -162,7 +162,6 @@ type + function FindLib(const Path,LibName : String) : String; + function GetMysqldPath : String; + function TableExists(TableName : String) : Boolean; +- function GetMySQLLib : String; + function GetDebugLevel : Integer; + + procedure CreateDBConnections; +@@ -267,6 +266,7 @@ type + function RbnCallExistsInLog(callsign,band,mode,LastDate,LastTime : String) : Boolean; + function CallNoteExists(Callsign : String) : Boolean; + function GetNewLogNumber : Integer; ++ function getNewMySQLConnectionObject : TMySQL57Connection; + + procedure SaveQSO(date : TDateTime; time_on,time_off,call : String; freq : Currency;mode,rst_s, + rst_r, stn_name,qth,qsl_s,qsl_r,qsl_via,iota,pwr : String; itu,waz : Integer; +@@ -1092,49 +1092,6 @@ begin + Writeln(' ',DLLUtilName) + end; + +- lib := GetMySQLLib; +- if fDebugLevel>=1 then Writeln('Loading libmysqlclient: ',lib); +- if lib <> '' then +- InitialiseMySQL(lib); +- +- try try +- c := TConnectionName.Create(nil); +- MySQLVer := copy(c.ClientInfo,1,3); +- +- if fDebugLevel>=1 then +- begin +- Writeln('**************************'); +- Writeln('MySQL version: ',MySQLVer); +- Writeln('**************************') +- end; +- +- if MySQLVer = '10.' then +- MySQLVer := '5.6'; +- if MySQLVer = '10.1' then +- MySQLVer := '5.7' +- +- except +- on E : Exception do +- begin +- Writeln('FATAL ERROR: Can not get MySQL client library version version!',LineEnding, +- 'Setting to default version (5.1)'); +- MySQLVer := '5.1' +- end +- end +- finally +- FreeAndNil(c) +- end; +- +- if not TryStrToCurr(MySQLVer,fMySQLVersion) then +- fMySQLVersion := 5.6; +- +- if fDebugLevel>=1 then +- begin +- Writeln('**********************************'); +- Writeln('MySQL version assigned: ',FloatToStr(fMySQLVersion)); +- Writeln('**********************************') +- end; +- + CreateDBConnections; + + MainCon.KeepConnection := True; +@@ -1148,13 +1105,11 @@ begin + end; + + //special connection for band map thread +- BandMapCon.KeepConnection := True; + BandMapCon.Transaction := trBandMapFil; + qBandMapFil.Transaction := trBandMapFil; + qBandMapFil.DataBase := BandMapCon; + trBandMapFil.DataBase := BandMapCon; + +- RbnMonCon.KeepConnection := True; + RbnMonCon.Transaction := trRbnMon; + qRbnMon.Transaction := trRbnMon; + qRbnMon.DataBase := RbnMonCon; +@@ -1194,7 +1149,6 @@ begin + Writeln('ZIP code directory: ',fZipCodeDir); + Writeln('Binary dir: ',ExtractFilePath(Paramstr(0))); + Writeln('Share dir: ',fShareDir); +- Writeln('TConnection to MySQL: ',FloatToStr(fMySQLVersion)); + Writeln('*') + end; + +@@ -4166,70 +4120,13 @@ end; + + procedure TdmData.CreateDBConnections; + begin +- if fMySQLVersion < 5.5 then +- begin +- MainCon := TMySQL51Connection.Create(self); +- BandMapCon := TMySQL51Connection.Create(self); +- RbnMonCon := TMySQL51Connection.Create(self); +- LogUploadCon := TMySQL51Connection.Create(self); +- dbDXC := TMySQL51Connection.Create(self) +- end +- else if fMySQLVersion < 5.6 then +- begin +- MainCon := TMySQL55Connection.Create(self); +- BandMapCon := TMySQL55Connection.Create(self); +- RbnMonCon := TMySQL55Connection.Create(self); +- LogUploadCon := TMySQL55Connection.Create(self); +- dbDXC := TMySQL55Connection.Create(self) +- end +- else begin +- if fMySQLVersion < 5.7 then +- begin +- MainCon := TMySQL56Connection.Create(self); +- BandMapCon := TMySQL56Connection.Create(self); +- RbnMonCon := TMySQL56Connection.Create(self); +- LogUploadCon := TMySQL56Connection.Create(self); +- dbDXC := TMySQL56Connection.Create(self) +- end +- else begin +- MainCon := TMySQL57Connection.Create(self); +- BandMapCon := TMySQL57Connection.Create(self); +- RbnMonCon := TMySQL57Connection.Create(self); +- LogUploadCon := TMySQL57Connection.Create(self); +- dbDXC := TMySQL57Connection.Create(self) +- end +- end ++ MainCon := getNewMySQLConnectionObject(); ++ BandMapCon := getNewMySQLConnectionObject(); ++ RbnMonCon := getNewMySQLConnectionObject(); ++ LogUploadCon := getNewMySQLConnectionObject(); ++ dbDXC := getNewMySQLConnectionObject(); + end; + +-function TdmData.GetMySQLLib : String; +-var +- lib : String; +- Paths : TStringList; +-begin +- Result := ''; +- Paths := TStringList.Create; +- try +- Paths.Add('/usr/lib64/'); +- Paths.Add('/lib64/'); +- Paths.Add('/usr/lib/x86_64-linux-gnu/'); +- Paths.Add('/usr/lib64/mysql/'); +- Paths.Add('/lib/x86_64-linux-gnu/'); +- +- Paths.Add('/usr/lib/i386-linux-gnu/'); +- Paths.Add('/lib/i386-linux-gnu/'); +- Paths.Add('/usr/lib/'); +- Paths.Add('/lib/'); +- Paths.Add('/usr/lib/mysql/'); +- +- Result := MyFindFile('libmariadbclient.so*', Paths); +- if (Result='') then +- begin +- Result := MyFindFile('libmysqlclient.so*', Paths) +- end +- finally +- FreeAndNil(Paths) +- end +-end; + + function TdmData.GetDebugLevel : Integer; + var +@@ -4315,5 +4212,16 @@ begin + QSOColorDate := now + end; + ++function TdmData.getNewMySQLConnectionObject : TMySQL57Connection; ++var ++ Connection : TMySQL57Connection; ++begin ++ Connection := TMySQL57Connection.Create(self); ++ Connection.SkipLibraryVersionCheck := True; ++ Connection.KeepConnection := True; ++ ++ result := Connection ++end; ++ + end. + +-- +2.18.1 + diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest index 7470617aa290..1b7113b394dc 100644 --- a/media-radio/js8call/Manifest +++ b/media-radio/js8call/Manifest @@ -1,4 +1,7 @@ AUX 0.7.5-makefile-removesymlink.patch 613 BLAKE2B 9a79e05572ce2f09384c6c94ace1f22714ac5cc46748bbdd724095ef55ddb861157334db8a9bf29a43712dda4b9853b030236946168c21c20c942ac1ae699b69 SHA512 22e8cc74f99a2200ef47ba1c2c3b2abd285a0871ef2cfac87a67e7f22a32ca4943861628e7313fdf6f20246da4c08c1fcbaa69d83960097fdd30a510294542a4 +AUX 0.8.0-makefile-removesymlink.patch 408 BLAKE2B 096eb4a34e60a16a46c324a04ad16688138569ab92a1937f97789e1520c258500e41c8771fcdd6aa612951aa5abd213e91d86bd82c7b2b1ff508e740346d9d60 SHA512 bb7620039ffb8e262a6cd018fdbdfef6df75e3ecae854c1a6de39a6924dfeb84e9e5536eb9f13e9ae620ac3794f342e5660c579d6b228d6d63d43b0f73c35d3b DIST js8call-0.7.5.tar.bz2 41230267 BLAKE2B 0d49f3d65ce7df501bdfee597ba8a7670dfb80217fec2f5d66859381cceaaf759e940c99b015246d58abe8549114ffe9ba3d67cebdee5122284fc2a221de02bf SHA512 e4e35a086a1443def71fe1bd9d057c3ec38f261b68818c841a90ef858d6c480b2cbb5f721ac26e1651836326b12059b2a01370a2c7c63925a40971d343e9f8e8 +DIST js8call-0.8.0.tar.bz2 41226056 BLAKE2B 68894f44c36bc1ede57e9596545a9dd1c3ae53ce0a24e3ea7086f5696ce4deeda2ef8e716ac2e02bfd71c69266a7e867898bfddc2616284a564c753af61e27a6 SHA512 5beb98c7f1d805e3c4dd06a584a5b5d0efc8336da527b6d3d4f53b480c366b8c9e4f902c8c6139bbb379d875538382d1c5a4549dd2a97f408656c7da6fec5796 EBUILD js8call-0.7.5.ebuild 1126 BLAKE2B e0fc86bce72d42c6ed0abbac139c9b82fbc74b627e74298d8bde8a1a140c48e21a6f452fb162f44f60693a5de473a7c75d4b59dfac6344aba1b0c9c3665dd47a SHA512 b6f2584cc3fb6305d912017f759b59d853af1d040ad5e5d0cd25578d507468190f0377348a7c7b69f40ecc45d01bd7c36935f4d574db44e8cf3258bb2fdb6241 +EBUILD js8call-0.8.0.ebuild 1126 BLAKE2B e0fc86bce72d42c6ed0abbac139c9b82fbc74b627e74298d8bde8a1a140c48e21a6f452fb162f44f60693a5de473a7c75d4b59dfac6344aba1b0c9c3665dd47a SHA512 b6f2584cc3fb6305d912017f759b59d853af1d040ad5e5d0cd25578d507468190f0377348a7c7b69f40ecc45d01bd7c36935f4d574db44e8cf3258bb2fdb6241 MISC metadata.xml 310 BLAKE2B 672d5f3bae07a95f76f3cdeb2407ffe32144f248a056083969d4dfa6a1fd0448382a01b5bd8e6ec4336478052a569d4710328d6a87eefa5c0cc1b53b05ee88ab SHA512 a64340db0f7654cfb3ff0af4508d1ffb83b61fd39877aff3503a7468142c64b8266f12d585e5d6ba3c2a05e6706deeb4c0408e05ed287a49546dee906602d045 diff --git a/media-radio/js8call/files/0.8.0-makefile-removesymlink.patch b/media-radio/js8call/files/0.8.0-makefile-removesymlink.patch new file mode 100644 index 000000000000..0bb3349cbdfd --- /dev/null +++ b/media-radio/js8call/files/0.8.0-makefile-removesymlink.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2018-10-31 17:52:18.252760284 -0400 ++++ a/CMakeLists.txt 2018-10-31 17:52:54.507461091 -0400 +@@ -1272,12 +1272,6 @@ + #COMPONENT runtime + ) + +- execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call) +- +- install(FILES +- ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call +- #COMPONENT runtime +- ) + endif (NOT WIN32 AND NOT APPLE) + + diff --git a/media-radio/js8call/js8call-0.8.0.ebuild b/media-radio/js8call/js8call-0.8.0.ebuild new file mode 100644 index 000000000000..9b2683cd0068 --- /dev/null +++ b/media-radio/js8call/js8call-0.8.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils vcs-snapshot + +MY_P=${P/_/-} + +DESCRIPTION="Weak signal ham radio communication" +HOMEPAGE="https://groups.io/g/js8call" +SRC_URI="https://bitbucket.org/widefido/wsjtx/get/v${PV}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtserialport:5 + dev-qt/qtprintsupport:5 + virtual/libusb:1 + media-libs/portaudio + sci-libs/fftw:3.0[threads,fortran] + virtual/fortran + app-text/asciidoc + media-libs/hamlib + doc? ( dev-ruby/asciidoctor )" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DWSJT_GENERATE_DOCS="$(usex doc)" + -DWSJT_DOC_DESTINATION="/doc/${PF}" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + rm "${D}"/usr/bin/rigctl{,d}-local || die + rm "${D}"/usr/share/doc/JS8Call -R || die + +} -- cgit v1.2.3