fbreader: deleted unmaintained port
This commit is contained in:
parent
a483859f21
commit
6970e3105d
GPG Key ID:
42F8B4E30B673606
@ -1,182 +0,0 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/FBReader
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
lrwxrwxrwx root/root usr/lib/libzlcore.so -> libzlcore.so.0.99.4
|
||||
lrwxrwxrwx root/root usr/lib/libzlcore.so.0.99 -> libzlcore.so.0.99.4
|
||||
-rwxr-xr-x root/root usr/lib/libzlcore.so.0.99.4
|
||||
lrwxrwxrwx root/root usr/lib/libzltext.so -> libzltext.so.0.99.4
|
||||
lrwxrwxrwx root/root usr/lib/libzltext.so.0.99 -> libzltext.so.0.99.4
|
||||
-rwxr-xr-x root/root usr/lib/libzltext.so.0.99.4
|
||||
lrwxrwxrwx root/root usr/lib/libzlui.so -> libzlui.so.0.99.4
|
||||
lrwxrwxrwx root/root usr/lib/libzlui.so.0.99 -> libzlui.so.0.99.4
|
||||
-rwxr-xr-x root/root usr/lib/libzlui.so.0.99.4
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/FBReader/
|
||||
drwxr-xr-x root/root usr/share/FBReader/default/
|
||||
-rw-r--r-- root/root usr/share/FBReader/default/config.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/default/external.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/default/fullscreen_toolbar.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/default/keymap.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/default/styles.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/default/toolbar.xml
|
||||
drwxr-xr-x root/root usr/share/FBReader/formats/
|
||||
drwxr-xr-x root/root usr/share/FBReader/formats/fb2/
|
||||
-rw-r--r-- root/root usr/share/FBReader/formats/fb2/FBReaderVersion.ent
|
||||
-rw-r--r-- root/root usr/share/FBReader/formats/fb2/fb2genres.xml
|
||||
drwxr-xr-x root/root usr/share/FBReader/formats/html/
|
||||
-rw-r--r-- root/root usr/share/FBReader/formats/html/html.ent
|
||||
drwxr-xr-x root/root usr/share/FBReader/formats/xhtml/
|
||||
-rw-r--r-- root/root usr/share/FBReader/formats/xhtml/xhtml-lat1.ent
|
||||
-rw-r--r-- root/root usr/share/FBReader/formats/xhtml/xhtml-special.ent
|
||||
-rw-r--r-- root/root usr/share/FBReader/formats/xhtml/xhtml-symbol.ent
|
||||
drwxr-xr-x root/root usr/share/FBReader/help/
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.bg.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.cs.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.de.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.en.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.es.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.fi.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.fr.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.he.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.hu.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.id.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.it.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.lt.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.nl.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.ru.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.sv.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.uk.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.vi.fb2
|
||||
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.zh.fb2
|
||||
drwxr-xr-x root/root usr/share/FBReader/resources/
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/ar.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/bg.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/cs.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/de.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/en.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/eo.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/es.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/fi.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/fr.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/he.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/hu.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/id.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/it.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/lt.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/nl.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/pl.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/ru.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/sv.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/uk.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/vi.xml
|
||||
-rw-r--r-- root/root usr/share/FBReader/resources/zh.xml
|
||||
drwxr-xr-x root/root usr/share/applications/
|
||||
-rw-r--r-- root/root usr/share/applications/FBReader.desktop
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/FBReader.1.gz
|
||||
drwxr-xr-x root/root usr/share/pixmaps/
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader.png
|
||||
drwxr-xr-x root/root usr/share/pixmaps/FBReader/
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/addBook.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/advancedSearchOnNetwork.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/back_button.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/back_button_disabled.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/bookInfo.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/booktree-author.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/booktree-book.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/booktree-catalog.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/booktree-tag.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/byAuthor.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/byTag.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/fb2.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/findNext.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/findPrevious.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/folder.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/forward_button.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/forward_button_disabled.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/gotoHome.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/html.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/mobipocket.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/oeb.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/openreader.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/palm.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/plucker.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/preferences.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/redo.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/refresh-icon-1.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/refresh-icon-2.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/refresh-icon.svg
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/rotate.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/rtf.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/search.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/search_icon.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/searchresult.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/showHelp.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/showLibrary.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/showNetLibrary.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/showNetworkLibrary.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/showReading.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/showRecent.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/spinner.gif
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/tcr.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/toc.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/undo.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/unknown.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/upfolder.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/weasel.png
|
||||
-rw-r--r-- root/root usr/share/pixmaps/FBReader/zipfolder.png
|
||||
drwxr-xr-x root/root usr/share/zlibrary/
|
||||
drwxr-xr-x root/root usr/share/zlibrary/default/
|
||||
-rw-r--r-- root/root usr/share/zlibrary/default/config.xml
|
||||
drwxr-xr-x root/root usr/share/zlibrary/encodings/
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/Big5
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/Encodings.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/GBK
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/IBM866
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-1
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-10
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-11
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-13
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-14
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-15
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-16
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-2
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-3
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-4
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-5
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-6
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-7
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-8
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/ISO-8859-9
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/KOI8-R
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/windows-1251
|
||||
-rw-r--r-- root/root usr/share/zlibrary/encodings/windows-1252
|
||||
-rw-r--r-- root/root usr/share/zlibrary/hyphenationPatterns.zip
|
||||
-rw-r--r-- root/root usr/share/zlibrary/keynames-qt4.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/languagePatterns.zip
|
||||
drwxr-xr-x root/root usr/share/zlibrary/resources/
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/ar.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/bg.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/cs.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/de.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/en.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/eo.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/es.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/fi.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/fr.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/he.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/hu.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/id.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/it.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/lt.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/nl.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/pl.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/ru.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/sv.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/uk.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/vi.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/resources/zh.xml
|
||||
-rw-r--r-- root/root usr/share/zlibrary/style.qss
|
||||
-rw-r--r-- root/root usr/share/zlibrary/unicode.xml.gz
|
||||
@ -1,7 +0,0 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF3ynWzYHsYOhQ4mskd545UvZZdaOZhi4LOlPVrPF+YmL+vpNt1ACz0vnyYa13RCRTQyngwCmXc3j3E6/5MZohQA8=
|
||||
SHA256 (Pkgfile) = a8db37587e276032992299ba902687eca5e111da6d5d077f1e1f403715f0cb01
|
||||
SHA256 (.footprint) = 15515f92137f0de89716adfb58a1ebf570cb1142618d6363c86d4f3db69d4fff
|
||||
SHA256 (fbreader-sources-0.99.4.tgz) = 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9
|
||||
SHA256 (fbreader-0.99.4.patch) = 1b967d15b6561f81f95d7fde6bf53a6aa4f1d8e3f3320a2d7a353f4c6f6543fc
|
||||
SHA256 (FBReader.desktop) = b42e9af54e72a38ad4854aace54f19f90602d3dc9b9e816e0fed803c8e4c3772
|
||||
@ -1,12 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=FBReader
|
||||
GenericName=E-book reader
|
||||
Comment=E-book reader
|
||||
TryExec=FBReader
|
||||
Exec=FBReader %F
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=FBReader
|
||||
Categories=Office;Viewer;Literature;
|
||||
MimeType=application/x-fictionbook+xml;
|
||||
@ -1,41 +0,0 @@
|
||||
# Description: An e-book reader for Linux
|
||||
# URL: http://www.fbreader.org/
|
||||
# Maintainer: Pedja, predivan at mts dot rs
|
||||
# Depends on: fribidi libunibreak qt4
|
||||
|
||||
name=fbreader
|
||||
version=0.99.4
|
||||
release=2
|
||||
source=(http://fbreader.org/files/desktop/fbreader-sources-$version.tgz
|
||||
fbreader-0.99.4.patch
|
||||
FBReader.desktop)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
||||
# export CFLAGS="${CFLAGS} -std=c++11"
|
||||
patch -p1 -i $SRC/fbreader-0.99.4.patch
|
||||
|
||||
# Respect *FLAGS
|
||||
sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
|
||||
-i makefiles/arch/desktop.mk
|
||||
sed -e "/^ CFLAGS +=/ d" \
|
||||
-i makefiles/config.mk
|
||||
sed -e "/^ LDFLAGS += -s$/ d" \
|
||||
-i makefiles/config.mk
|
||||
sed -e "/^LDFLAGS =$/ d" \
|
||||
-i makefiles/arch/desktop.mk
|
||||
|
||||
echo "TARGET_ARCH = desktop" > makefiles/target.mk
|
||||
echo "UI_TYPE = qt4" >> makefiles/target.mk
|
||||
echo "TARGET_STATUS = release" >> makefiles/target.mk
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
mkdir -p $PKG/usr/share/man/man1
|
||||
install -m644 fbreader/desktop/FBReader.1 $PKG/usr/share/man/man1
|
||||
|
||||
mkdir -p $PKG/usr/share/applications/
|
||||
install -m644 $SRC/FBReader.desktop $PKG/usr/share/applications/FBReader.desktop
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
diff -Naur fbreader-0.99.4/fbreader/desktop/desktop fbreader-0.99.4-new/fbreader/desktop/desktop
|
||||
--- fbreader-0.99.4/fbreader/desktop/desktop 2012-11-30 13:41:25.000000000 +0100
|
||||
+++ fbreader-0.99.4-new/fbreader/desktop/desktop 2018-02-19 17:21:15.232343234 +0100
|
||||
@@ -21,3 +21,4 @@
|
||||
Type=Application
|
||||
Icon=FBReader
|
||||
Categories=Office;Viewer;Literature;
|
||||
+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
|
||||
diff -Naur fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4-new/fbreader/src/formats/doc/OleStorage.cpp
|
||||
--- fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp 2012-11-30 13:41:25.000000000 +0100
|
||||
+++ fbreader-0.99.4-new/fbreader/src/formats/doc/OleStorage.cpp 2018-02-19 17:20:53.327387155 +0100
|
||||
@@ -59,7 +59,7 @@
|
||||
clear();
|
||||
return false;
|
||||
}
|
||||
- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
|
||||
+ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
|
||||
if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
|
||||
clear();
|
||||
return false;
|
||||
diff -Naur fbreader-0.99.4/makefiles/config.mk fbreader-0.99.4-new/makefiles/config.mk
|
||||
--- fbreader-0.99.4/makefiles/config.mk 2012-11-30 13:41:25.000000000 +0100
|
||||
+++ fbreader-0.99.4-new/makefiles/config.mk 2018-02-19 17:19:25.261563732 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
ARCHIVER_LIBS ?= -lz -lbz2
|
||||
|
||||
CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
|
||||
+CFLAGS += -Wno-narrowing
|
||||
ifeq "$(ZLSHARED)" "yes"
|
||||
CFLAGS += -fPIC -DZLSHARED
|
||||
endif
|
||||
diff -Naur fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4-new/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
|
||||
--- fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 13:41:25.000000000 +0100
|
||||
+++ fbreader-0.99.4-new/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2018-02-19 17:19:43.699526763 +0100
|
||||
@@ -48,4 +48,5 @@
|
||||
static const std::string replacement = (const char*)QDir::homePath().toUtf8();
|
||||
path = replacement + path.substr(1);
|
||||
}
|
||||
+ ZLUnixFSManager::normalizeRealPath(path);
|
||||
}
|
||||
diff -Naur fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4-new/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
|
||||
--- fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 13:41:25.000000000 +0100
|
||||
+++ fbreader-0.99.4-new/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-02-19 17:21:23.657326342 +0100
|
||||
@@ -86,7 +86,7 @@
|
||||
}
|
||||
|
||||
void QtWaitingSpinner::setRoundness(qreal roundness) {
|
||||
- myRoundness = std::max(0.0, std::min(100.0, roundness));
|
||||
+ myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
|
||||
}
|
||||
|
||||
void QtWaitingSpinner::setColor(QColor color) {
|
||||
@@ -148,7 +148,7 @@
|
||||
qreal alphaDiff = color.alphaF() - (qreal)minAlphaF;
|
||||
qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
|
||||
qreal resultAlpha = color.alphaF() - gradation * distance;
|
||||
- resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
|
||||
+ resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
|
||||
color.setAlphaF(resultAlpha);
|
||||
return color;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user