mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
115 lines
3.5 KiB
Plaintext
115 lines
3.5 KiB
Plaintext
From dbc302a19c823e1c7b119549d3157ed3cc7c27d6 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Tue, 11 Sep 2018 07:46:33 +0200
|
|
Subject: set correct paths to NONPACKAGED_FONTS_DIRECTORY
|
|
|
|
|
|
diff --git a/src/fonts.c b/src/fonts.c
|
|
index d6a5ad5..f7290e9 100644
|
|
--- a/src/fonts.c
|
|
+++ b/src/fonts.c
|
|
@@ -970,10 +970,12 @@ static void loadfonts(SDL_Surface * screen, const char *const dir)
|
|
|
|
result = find_directory(B_SYSTEM_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
|
|
loadfonts(screen, buffer);
|
|
- result = find_directory(B_COMMON_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
|
|
+ result = find_directory(B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
|
|
loadfonts(screen, buffer);
|
|
result = find_directory(B_USER_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
|
|
loadfonts(screen, buffer);
|
|
+ result = find_directory(B_USER_NONPACKAGED_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
|
|
+ loadfonts(screen, buffer);
|
|
#elif defined(__APPLE__)
|
|
loadfonts(screen, "/System/Library/Fonts");
|
|
loadfonts(screen, "/Library/Fonts");
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From 69d3a45aa741d1524ff4d546df97a30433119598 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Tue, 11 Sep 2018 14:30:49 +0200
|
|
Subject: gcc2 fixes
|
|
|
|
|
|
diff --git a/src/i18n.c b/src/i18n.c
|
|
index 57eb7da..2b0801f 100644
|
|
--- a/src/i18n.c
|
|
+++ b/src/i18n.c
|
|
@@ -984,9 +984,11 @@ static int set_current_language(const char *restrict locale_choice) MUST_CHECK;
|
|
static int set_current_language(const char *restrict loc)
|
|
{
|
|
int i;
|
|
+ int j = 0;
|
|
int y_nudge = 0;
|
|
char *oldloc;
|
|
char *env_language;
|
|
+ char *env_language_lang;
|
|
|
|
|
|
if (strlen(loc) > 0)
|
|
@@ -1081,8 +1083,6 @@ static int set_current_language(const char *restrict loc)
|
|
mysetenv("LANGUAGE", "C");
|
|
}
|
|
env_language = strdup(getenv("LANGUAGE"));
|
|
- int j = 0;
|
|
- char *env_language_lang;
|
|
|
|
if (*env_language)
|
|
{
|
|
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
|
|
index fd64d88..2d8c9c0 100644
|
|
--- a/src/tuxpaint.c
|
|
+++ b/src/tuxpaint.c
|
|
@@ -19711,6 +19711,7 @@ static int do_color_sel(void)
|
|
int done, chose;
|
|
int back_left, back_top;
|
|
int color_sel_x, color_sel_y;
|
|
+ int want_animated_popups = 1;
|
|
SDL_Surface *tmp_btn_up, *tmp_btn_down;
|
|
|
|
Uint32(*getpixel_tmp_btn_up) (SDL_Surface *, int, int);
|
|
@@ -19731,7 +19732,6 @@ static int do_color_sel(void)
|
|
|
|
/* FIXME this is the first step to make animated popups optional,
|
|
to be removed from here when implemented in a more general way */
|
|
- int want_animated_popups = 1;
|
|
|
|
hide_blinking_cursor();
|
|
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From 191985449de945c74f575ef33efca25edbd74350 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 30 Aug 2014 20:51:07 +0000
|
|
Subject: don't use BeOS install directions for Haiku
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index c1dc400..d8d07a5 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -131,7 +131,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
|
|
# For macOS, the prefix is relative to DESTDIR.
|
|
windows_PREFIX:=/usr/local
|
|
osx_PREFIX:=Resources
|
|
-beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint
|
|
+#beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint
|
|
linux_PREFIX:=/usr/local
|
|
PREFIX:=$($(OS)_PREFIX)
|
|
|
|
@@ -462,7 +462,7 @@ trans:
|
|
|
|
windows_ARCH_INSTALL:=
|
|
osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
|
|
-beos_ARCH_INSTALL:=install-haiku
|
|
+#beos_ARCH_INSTALL:=install-haiku
|
|
linux_ARCH_INSTALL:=install-kde install-kde-icons
|
|
ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
|
|
|
|
--
|
|
2.16.4
|
|
|