svn commit: r515854 - in head/graphics/milton: . files

[Alexey Dokuchaev]

Author: danfe
Date: Mon Oct 28 11:36:02 2019
New Revision: 515854
URL: https://svnweb.freebsd.org/changeset/ports/515854

Log:
  - Update `graphics/milton' to version 1.9.1
  - Drop local fixes that were integrated upstream
  
  Reported by:	portscout

Modified:
  head/graphics/milton/Makefile
  head/graphics/milton/distinfo
  head/graphics/milton/files/patch-src_platform__linux.cc

Modified: head/graphics/milton/Makefile
==============================================================================
--- head/graphics/milton/Makefile	Mon Oct 28 11:22:10 2019	(r515853)
+++ head/graphics/milton/Makefile	Mon Oct 28 11:36:02 2019	(r515854)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	milton
-PORTVERSION=	1.9.0
+PORTVERSION=	1.9.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
@@ -31,8 +31,6 @@ PLIST_FILES+=	share/icons/hicolor/${n}x${n}/apps/milto
 post-patch:
 	@${REINPLACE_CMD} -e 's:__linux__:__${OPSYS}__:' \
 		${WRKSRC}/src/easytab.h
-	@${REINPLACE_CMD} -e '39s:^:#undef COUNT:' \
-		${WRKSRC}/src/milton.h
 	@${REINPLACE_CMD} -e 's:Carlito\.ttf:${DATADIR}/&:' \
 		${WRKSRC}/src/sdl_milton.cc
 	@${REINPLACE_CMD} -e 's:milton\.png:${PREFIX}/share/icons/hicolor/256x256/apps/&:' \

Modified: head/graphics/milton/distinfo
==============================================================================
--- head/graphics/milton/distinfo	Mon Oct 28 11:22:10 2019	(r515853)
+++ head/graphics/milton/distinfo	Mon Oct 28 11:36:02 2019	(r515854)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569705067
-SHA256 (serge-rgb-milton-v1.9.0_GH0.tar.gz) = fd6ae60c41db203a1f6008c0d82b74ce527a05f47b25234560d2b7596bbca073
-SIZE (serge-rgb-milton-v1.9.0_GH0.tar.gz) = 12068156
+TIMESTAMP = 1572213734
+SHA256 (serge-rgb-milton-v1.9.1_GH0.tar.gz) = 4d307274782a077841884b198f43526c7d2d55944a75351e0b6dd7e99c3b2455
+SIZE (serge-rgb-milton-v1.9.1_GH0.tar.gz) = 11157753

Modified: head/graphics/milton/files/patch-src_platform__linux.cc
==============================================================================
--- head/graphics/milton/files/patch-src_platform__linux.cc	Mon Oct 28 11:22:10 2019	(r515853)
+++ head/graphics/milton/files/patch-src_platform__linux.cc	Mon Oct 28 11:36:02 2019	(r515854)
@@ -18,16 +18,7 @@
  }
  
  void
-@@ -148,7 +150,7 @@ platform_dialog_yesno(char* info, char* title)
- }
- 
- YesNoCancelAnswer
--platform_dialog_yesnocancel(char* info, char* title);
-+platform_dialog_yesnocancel(char* info, char* title)
- {
-     // NOTE: As of 2019-09-23, this function hasn't been tested on Linux.
- 
-@@ -342,5 +344,32 @@ platform_deinit(PlatformState* platform)
+@@ -357,7 +359,14 @@ platform_deinit(PlatformState* platform)
  void
  platform_setup_cursor(Arena* arena, PlatformState* platform)
  {
@@ -39,24 +30,6 @@
 +
 +    SDL_SetWindowIcon(platform->window, surface);
 +    SDL_FreeSurface(surface);
-+}
-+
-+v2i
-+platform_cursor_get_position(PlatformState* platform)
-+{
-+    v2i pos;
-+
-+    SDL_GetMouseState(&pos.x, &pos.y);
-+    return pos;
-+}
-+
-+void
-+platform_cursor_set_position(PlatformState* platform, v2i pos)
-+{
-+    SDL_WarpMouseInWindow(platform->window, pos.x, pos.y);
-+
-+    // Pending mouse move events will have the cursor close
-+    // to where it was before we set it.
-+    SDL_FlushEvent(SDL_MOUSEMOTION);
-+    SDL_FlushEvent(SDL_SYSWMEVENT);
  }
+ 
+ v2i