diff --git a/sources b/sources index 8eae2cf..c180a07 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -f8893678381f8d7cf94b61b26168ee51 vdr-plugin-skinenigmang-3362ab0175c8e99375230627e772c1652559d9f4.tar.bz2 -736483b8d94c04f5dce5d99ebb3a3bf1 skinenigmang-logos-xpm-hi-20070702.tgz +SHA512 (skinenigmang-logos-xpm-hi-20070702.tgz) = 5c5d4de786478b16947c0a3a34bf1910dfbd4cfc6b056d13fb6c481165ead9c2204fb005c6177720a53ef2d58644f9b3366a5cde53de8d25aa777c481f4a61cf diff --git a/vdr-skinenigmang-0.1.3-min.patch b/vdr-skinenigmang-0.1.3-min.patch new file mode 100644 index 0000000..a814d2e --- /dev/null +++ b/vdr-skinenigmang-0.1.3-min.patch @@ -0,0 +1,20 @@ +--- a/enigma.c.orig 2018-04-17 22:00:15.872261801 +0200 ++++ b/enigma.c 2018-04-17 22:02:49.715082918 +0200 +@@ -1380,7 +1380,7 @@ + } + + lineHeight = pFontList->Height(); +- nMarkerGap = min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap ++ nMarkerGap = std::min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap + xItemLeft = xBodyLeft + (EnigmaConfig.showMarker ? lineHeight : ListHBorder); + xItemRight = (fShowLogo || fShowInfo ? xBodyRight : xInfoRight) - ListHBorder - SmallGap - SmallGap - SmallGap; + int numItems = MaxItems(); +@@ -3808,7 +3808,7 @@ + } + + lineHeight = pFontListItem->Height(); +- nMarkerGap = min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap ++ nMarkerGap = std::min(MarkerGap, lineHeight / 2 - 1); //lineHeight - 2 * MarkerGap + int LogoSize = IconHeight; + LogoSize += (LogoSize % 2 ? 1 : 0); + currentIndex = -1; diff --git a/vdr-skinenigmang.spec b/vdr-skinenigmang.spec index b9d5dd5..5355673 100644 --- a/vdr-skinenigmang.spec +++ b/vdr-skinenigmang.spec @@ -5,7 +5,7 @@ Name: vdr-%{pname} Version: 0.1.3 -Release: 7.%{gitdate}git%{shortcommit}%{?dist} +Release: 8.%{gitdate}git%{shortcommit}%{?dist} Summary: A skin for VDR based on the Enigma text2skin add on Group: Applications/Multimedia @@ -15,6 +15,8 @@ Source0: http://projects.vdr-developer.org/git/vdr-plugin-skinenigmang.gi Source1: http://andreas.vdr-developer.org/enigmang/download/skinenigmang-logos-xpm-hi-20070702.tgz Source2: %{name}.conf Patch0: %{name}-0.1.3-config.patch +# https://www.vdr-portal.de/forum/index.php?thread/131020-skinenigmang-plugin/&postID=1296299#post1296299 +Patch1: %{name}-0.1.3-min.patch BuildRequires: freetype-devel BuildRequires: GraphicsMagick-c++-devel @@ -30,6 +32,7 @@ iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README mv skinenigmang/HISTORY HISTORY.logos mv skinenigmang/README README.logos %patch0 -p1 +%patch1 -p1 %build make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr \ @@ -68,6 +71,10 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale %changelog +* Tue Apr 17 2018 Martin Gansser - 0.1.3-8.20150920git3362ab0 +- Rebuilt for vdr-2.4.0 +- Add %%{name}-0.1.3-min.patch + * Fri Feb 09 2018 Fedora Release Engineering - 0.1.3-7.20150920git3362ab0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild