This is an automated email from the git hooks/post-receive script. tiber-guest pushed a commit to branch master in repository vdr-plugin-skinenigmang.
commit b05923c9f1f4921a2028e92e4c3f79541730c39e Author: Tobias Grimm <[email protected]> Date: Sun Jan 28 16:44:12 2018 +0100 Added VDR 2.3.2 compatibility patch provided by Frank Neuman --- debian/patches/series | 1 + .../vdr-plugin-skinenigma_min_max_from_stl.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/patches/series b/debian/patches/series index 7520774..b9e0541 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-imagemagick-path.patch +vdr-plugin-skinenigma_min_max_from_stl.patch diff --git a/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch b/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch new file mode 100644 index 0000000..2a8b741 --- /dev/null +++ b/debian/patches/vdr-plugin-skinenigma_min_max_from_stl.patch @@ -0,0 +1,22 @@ +Index: b/enigma.c +=================================================================== +--- a/enigma.c ++++ b/enigma.c +@@ -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; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-skinenigmang.git _______________________________________________ pkg-vdr-dvb-changes mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-vdr-dvb-changes
