goldendict: drop, use goldendict-ng instead
https://github.com/xiaoyifang/goldendict-ng
This commit is contained in:
@@ -1,49 +0,0 @@
|
||||
diff --git i/config.cc w/config.cc
|
||||
index 04b63f5..7a453d9 100644
|
||||
--- i/config.cc
|
||||
+++ w/config.cc
|
||||
@@ -182,7 +182,7 @@ Preferences::Preferences():
|
||||
pronounceOnLoadPopup( false ),
|
||||
useInternalPlayer( InternalPlayerBackend::anyAvailable() ),
|
||||
internalPlayerBackend( InternalPlayerBackend::defaultBackend() ),
|
||||
- checkForNewReleases( true ),
|
||||
+ checkForNewReleases( false ),
|
||||
disallowContentFromOtherSites( false ),
|
||||
enableWebPlugins( false ),
|
||||
hideGoldenDictHeader( false ),
|
||||
@@ -867,8 +867,8 @@ Class load() THROW_SPEC( exError )
|
||||
c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text();
|
||||
}
|
||||
|
||||
- if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
|
||||
- c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
|
||||
+ //if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
|
||||
+ // c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
|
||||
|
||||
if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() )
|
||||
c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
|
||||
@@ -1819,9 +1819,9 @@ void save( Class const & c ) THROW_SPEC( exError )
|
||||
proxy.appendChild( opt );
|
||||
}
|
||||
|
||||
- opt = dd.createElement( "checkForNewReleases" );
|
||||
- opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
|
||||
- preferences.appendChild( opt );
|
||||
+ //opt = dd.createElement( "checkForNewReleases" );
|
||||
+ //opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
|
||||
+ //preferences.appendChild( opt );
|
||||
|
||||
opt = dd.createElement( "disallowContentFromOtherSites" );
|
||||
opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) );
|
||||
diff --git i/preferences.cc w/preferences.cc
|
||||
index 72c3147..7e48f00 100644
|
||||
--- i/preferences.cc
|
||||
+++ w/preferences.cc
|
||||
@@ -314,6 +314,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
|
||||
this, SLOT( customProxyToggled( bool ) ) );
|
||||
|
||||
ui.checkForNewReleases->setChecked( p.checkForNewReleases );
|
||||
+ ui.checkForNewReleases->setEnabled( false );
|
||||
ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites );
|
||||
ui.enableWebPlugins->setChecked( p.enableWebPlugins );
|
||||
ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader );
|
||||
@@ -1,62 +0,0 @@
|
||||
diff --git i/goldendict.pro w/goldendict.pro
|
||||
index 4a4a3094..082b728f 100644
|
||||
--- i/goldendict.pro
|
||||
+++ w/goldendict.pro
|
||||
@@ -212,22 +212,19 @@ mac {
|
||||
-llzo2
|
||||
!CONFIG( no_ffmpeg_player ) {
|
||||
LIBS += -lao \
|
||||
- -lswresample-gd \
|
||||
- -lavutil-gd \
|
||||
- -lavformat-gd \
|
||||
- -lavcodec-gd
|
||||
+ -lswresample \
|
||||
+ -lavutil \
|
||||
+ -lavformat \
|
||||
+ -lavcodec
|
||||
}
|
||||
- INCLUDEPATH = $${PWD}/maclibs/include
|
||||
- LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
|
||||
+ LIBS += -framework AppKit -framework Carbon
|
||||
OBJECTIVE_SOURCES += lionsupport.mm \
|
||||
machotkeywrapper.mm \
|
||||
macmouseover.mm \
|
||||
speechclient_mac.mm
|
||||
ICON = icons/macicon.icns
|
||||
QMAKE_INFO_PLIST = myInfo.plist
|
||||
- QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
|
||||
- cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
|
||||
- mkdir -p GoldenDict.app/Contents/MacOS/locale & \
|
||||
+ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
|
||||
cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
|
||||
mkdir -p GoldenDict.app/Contents/MacOS/help & \
|
||||
cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
|
||||
@@ -235,15 +232,6 @@ mac {
|
||||
CONFIG += zim_support
|
||||
!CONFIG( no_chinese_conversion_support ) {
|
||||
CONFIG += chinese_conversion_support
|
||||
- CONFIG( x86 ) {
|
||||
- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
|
||||
- cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
|
||||
- cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/
|
||||
- } else {
|
||||
- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
|
||||
- cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
|
||||
- cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/
|
||||
- }
|
||||
}
|
||||
}
|
||||
DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
|
||||
diff --git i/tiff.cc w/tiff.cc
|
||||
index e3cb8bf5..95dd812f 100644
|
||||
--- i/tiff.cc
|
||||
+++ w/tiff.cc
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "tiff.hh"
|
||||
|
||||
-#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
|
||||
+#if defined (Q_OS_WIN)
|
||||
#include "tiff/tiff.h"
|
||||
#include "tiff/tiffio.h"
|
||||
#else
|
||||
@@ -1,116 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libxtst,
|
||||
libvorbis,
|
||||
hunspell,
|
||||
lzo,
|
||||
xz,
|
||||
bzip2,
|
||||
libiconv,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qtwebkit,
|
||||
qtx11extras,
|
||||
qttools,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
withCC ? true,
|
||||
opencc,
|
||||
withEpwing ? true,
|
||||
libeb,
|
||||
withExtraTiff ? true,
|
||||
libtiff,
|
||||
withFFmpeg ? true,
|
||||
libao,
|
||||
ffmpeg,
|
||||
withMultimedia ? true,
|
||||
withZim ? true,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goldendict";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goldendict";
|
||||
repo = "goldendict";
|
||||
rev = version;
|
||||
hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-dont-check-for-updates.patch
|
||||
./0001-dont-use-maclibs.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace goldendict.pro \
|
||||
--replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" \
|
||||
--replace "opencc.2" "opencc"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwebkit
|
||||
qttools
|
||||
libvorbis
|
||||
hunspell
|
||||
xz
|
||||
lzo
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
qtx11extras
|
||||
libxtst
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
bzip2
|
||||
libiconv
|
||||
]
|
||||
++ lib.optional withCC opencc
|
||||
++ lib.optional withEpwing libeb
|
||||
++ lib.optional withExtraTiff libtiff
|
||||
++ lib.optionals withFFmpeg [
|
||||
libao
|
||||
ffmpeg
|
||||
]
|
||||
++ lib.optional withZim zstd;
|
||||
|
||||
qmakeFlags = [
|
||||
"goldendict.pro"
|
||||
(lib.optional withCC "CONFIG+=chinese_conversion_support")
|
||||
(lib.optional (!withCC) "CONFIG+=no_chinese_conversion_support")
|
||||
(lib.optional (!withEpwing) "CONFIG+=no_epwing_support")
|
||||
(lib.optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler")
|
||||
(lib.optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player")
|
||||
(lib.optional (!withMultimedia) "CONFIG+=no_qtmultimedia_player")
|
||||
(lib.optional withZim "CONFIG+=zim_support")
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv GoldenDict.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://goldendict.org/";
|
||||
description = "Feature-rich dictionary lookup program";
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
mainProgram = "goldendict";
|
||||
maintainers = with lib.maintainers; [
|
||||
sikmir
|
||||
];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
@@ -890,6 +890,7 @@ mapAliases {
|
||||
godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
|
||||
goldendict = throw "'goldendict' has been removed as upstream goldendict/goldendict is unmaintained and depends on deprecated qtwebkit; use the actively-developed Qt6 fork 'goldendict-ng' instead"; # Added 2026-04-26
|
||||
goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
|
||||
goocanvas2 = warnAlias "'goocanvas2' has been renamed to goocanvas_2" goocanvas_2; # Added 2026-01-17
|
||||
goocanvas3 = warnAlias "'goocanvas3' has been renamed to goocanvas_3" goocanvas_3; # Added 2026-01-17
|
||||
|
||||
@@ -9311,8 +9311,6 @@ with pkgs;
|
||||
};
|
||||
gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;
|
||||
|
||||
goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
|
||||
|
||||
inherit (ocamlPackages) google-drive-ocamlfuse;
|
||||
|
||||
gqrx-portaudio = gqrx.override {
|
||||
|
||||
Reference in New Issue
Block a user