uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,49 @@
|
|||
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 );
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
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
|
||||
69
pkgs/applications/misc/goldendict/default.nix
Normal file
69
pkgs/applications/misc/goldendict/default.nix
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config
|
||||
, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv
|
||||
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake
|
||||
, withCC ? true, opencc
|
||||
, withEpwing ? true, libeb
|
||||
, withExtraTiff ? true, libtiff
|
||||
, withFFmpeg ? true, libao, ffmpeg
|
||||
, withMultimedia ? true
|
||||
, withZim ? true, zstd }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "goldendict";
|
||||
version = "2022-05-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goldendict";
|
||||
repo = pname;
|
||||
rev = "f810c6bd724e61977b4e94ca2d8abfa5bd766379";
|
||||
sha256 = "sha256-gNM+iahoGQy8TlNFLQx5ksITzQznv7MWMX/88QCTnL0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-dont-check-for-updates.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./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 ];
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtwebkit qttools
|
||||
libvorbis hunspell xz lzo
|
||||
] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ]
|
||||
++ lib.optionals stdenv.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 = with lib; [
|
||||
"goldendict.pro"
|
||||
(optional withCC "CONFIG+=chinese_conversion_support")
|
||||
(optional (!withCC) "CONFIG+=no_chinese_conversion_support")
|
||||
(optional (!withEpwing) "CONFIG+=no_epwing_support")
|
||||
(optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler")
|
||||
(optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player")
|
||||
(optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player")
|
||||
(optional withZim "CONFIG+=zim_support")
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv GoldenDict.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://goldendict.org/";
|
||||
description = "A feature-rich dictionary lookup program";
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ gebner astsmtl sikmir ];
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue