diff options
| author | danfe <danfe@FreeBSD.org> | 2019-10-28 19:36:02 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2019-10-28 19:36:02 +0800 |
| commit | 39d4b57267788e7e25da6b8a8cd55d6715c54333 (patch) | |
| tree | d6a0fd7e2e0aaf2101b8b14eaf87709580663a43 /graphics | |
| parent | dc39ee8a83e479fd542e4c15f61ab3cb1967387a (diff) | |
| download | freebsd-ports-gnome-39d4b57267788e7e25da6b8a8cd55d6715c54333.tar.gz freebsd-ports-gnome-39d4b57267788e7e25da6b8a8cd55d6715c54333.tar.zst freebsd-ports-gnome-39d4b57267788e7e25da6b8a8cd55d6715c54333.zip | |
- Update `graphics/milton' to version 1.9.1
- Drop local fixes that were integrated upstream
Reported by: portscout
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/milton/Makefile | 4 | ||||
| -rw-r--r-- | graphics/milton/distinfo | 6 | ||||
| -rw-r--r-- | graphics/milton/files/patch-src_platform__linux.cc | 33 |
3 files changed, 7 insertions, 36 deletions
diff --git a/graphics/milton/Makefile b/graphics/milton/Makefile index 4f5445bff9c2..bb9c413280c2 100644 --- a/graphics/milton/Makefile +++ b/graphics/milton/Makefile @@ -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/milton.png 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/&:' \ diff --git a/graphics/milton/distinfo b/graphics/milton/distinfo index 66a14eb2a76f..afa0adbb10b2 100644 --- a/graphics/milton/distinfo +++ b/graphics/milton/distinfo @@ -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 diff --git a/graphics/milton/files/patch-src_platform__linux.cc b/graphics/milton/files/patch-src_platform__linux.cc index 81071792e359..c820293a151c 100644 --- a/graphics/milton/files/patch-src_platform__linux.cc +++ b/graphics/milton/files/patch-src_platform__linux.cc @@ -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 |