diff options
Diffstat (limited to 'x11-misc/macopix')
| -rw-r--r-- | x11-misc/macopix/Manifest | 2 | ||||
| -rw-r--r-- | x11-misc/macopix/files/macopix-1.7.4-windres.patch | 58 | ||||
| -rw-r--r-- | x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch | 143 | ||||
| -rw-r--r-- | x11-misc/macopix/files/macopix-3.4.0-Werror.patch | 11 | ||||
| -rw-r--r-- | x11-misc/macopix/files/macopix-3.4.0-fno-common.patch | 357 | ||||
| -rw-r--r-- | x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch | 10 | ||||
| -rw-r--r-- | x11-misc/macopix/files/macopix-3.4.0-windres.patch | 11 | ||||
| -rw-r--r-- | x11-misc/macopix/macopix-1.7.4-r1.ebuild | 86 | ||||
| -rw-r--r-- | x11-misc/macopix/macopix-3.4.0.ebuild (renamed from x11-misc/macopix/macopix-1.7.4-r2.ebuild) | 32 | ||||
| -rw-r--r-- | x11-misc/macopix/metadata.xml | 10 |
10 files changed, 556 insertions, 164 deletions
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest index 62b2cb2f5ac8..a43d64dec426 100644 --- a/x11-misc/macopix/Manifest +++ b/x11-misc/macopix/Manifest @@ -1,4 +1,4 @@ -DIST macopix-1.7.4.tar.bz2 725481 BLAKE2B 1712dba8efe53fa78077d77faf7a84654bb87c72b6d9067484ce8b54da448326543082e2a245fbe1b61c824084744f51c0de321076a0e23586514c694840a040 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7 +DIST macopix-3.4.0.tar.gz 2854634 BLAKE2B 95ecb17588562a86db7e2c7b8c0832ebaea5b56e2c80814c365058954ce2655ac91f0109b1b0db4f7b8c1a98fde7162ee6c23fe3b2187cbeb22681714df2a595 SHA512 99b9dbbc7ca0cb3fa9c1881800e019ccae1c6439f300f479625a5b4877a0578b4a68b131ecbc0adc4a4393a867fd0ac9df7b52adaf2057f14142d1ddaf54fd53 DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 BLAKE2B 943f30f19bf2108a7e412ca0404f8c47324fc2e9bac5c13c9fcf35d6a4c9944f25afee3754898e6449f46247572c35a42cbe9f7c1b123f3e9e00fc0f33a0a260 SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333 DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 BLAKE2B d2a7022cad1856dcebc7594acad449d4de1909ab7f33788b69c562c2d376427d91e993b2c4300a968566d7fed8d3a7e6f7596ef3adcc7897ed6a1c8fd3bb5815 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2 DIST macopix-mascot-cosmos-euc-ja-1.02.tar.gz 329269 BLAKE2B 87d2357778f6e5d91232054dca16abc71224c1837a7a66569c8891d0720e0ffb2e9ab8745c76f44d0c8827a89afc412d703a1e66e2e46b3c8d7e49940d8c7880 SHA512 05b126b872c7ddf7dfe5b6fdd9654b8f97f6e005d8fa8ad30277a379c333cb0defaad43f9165db4712fc7e4d755fdddd34dce49a99f89c56f4dc951340fc7b1b diff --git a/x11-misc/macopix/files/macopix-1.7.4-windres.patch b/x11-misc/macopix/files/macopix-1.7.4-windres.patch deleted file mode 100644 index e26bf62e7b74..000000000000 --- a/x11-misc/macopix/files/macopix-1.7.4-windres.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -145,26 +145,10 @@ - [use Gtk+1.2 insted of Gtk+2]), - [use_gtk1=yes]) - --if test x"${use_gtk1}" = "xyes"; then --AM_PATH_GLIB(1.2.6,, -- AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.), -- gthread) --AM_PATH_GTK(1.2.0, , -- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)) --AM_PATH_GDK_PIXBUF(0.7.0, , -- AC_MSG_ERROR(Cannot find GdkPixbuf: Is gdk-pixbuf-config in path?)) --dnl for libpng (In the case of Gtk+2, gdk_pixbuf_save are used.) --AC_CHECK_LIB(png,png_create_write_struct, -- [PNGLIB_LIBS="-lz -lpng -lm"], -- [AC_MSG_ERROR(libpng is required.)], -- -lz -lm) -- --else - AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([glib-2.x is required]), gthread gobject) - AM_PATH_GTK_2_0(2.0.0,, AC_MSG_ERROR([gtk+-2.x is required]), gthread gobject) - AC_DEFINE(USE_GTK2,[], [Use Gtk+2.x instead of Gtk+1.x]) - PNGLIB_LIBS="" --fi - AC_SUBST(PNGLIB_LIBS) - - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,14 +9,6 @@ - bmp.h sockmsg.h codeconv.h unmime.h base64.h quoted-printable.h\ - macopix_icon.h tar32api.h ssl.h - --if HAVE_WINDRES --MACOPIX_RES = macopix.res --macopix.res: macopix_res.rc -- $(WINDRES) $< -O coff -o $@ --else --MACOPIX_RES = --endif -- - EXTRA_DIST = \ - macopix_res.rc.in\ - macopix.ico\ -@@ -25,9 +17,9 @@ - tar32.dll\ - libtar32.a - --INCLUDES = @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ $(GNUTLS_CFLAGS)\ -+INCLUDES = @GTK_CFLAGS@ $(GNUTLS_CFLAGS)\ - $(DISABLE_DEPRECATED) --LDADD = @GTK_LIBS@ @GDK_PIXBUF_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\ -+LDADD = @GTK_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\ - $(MACOPIX_RES) $(WINSOCK_LIBS) $(UNLHA32_LIBS) $(TAR32_LIBS) $(GNUTLS_LIBS) $(WIN32_ICONV_LIBS) - CLEANFILES = *~ - DISTCLEANFILES = .deps/*.P diff --git a/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch new file mode 100644 index 000000000000..9bd9d9ecbd96 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch @@ -0,0 +1,143 @@ +From c3bbb22f131ea6e273d4921bd60c73e78a13e00b Mon Sep 17 00:00:00 2001 +From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org> +Date: Sat, 8 Aug 2020 03:45:19 +0800 +Subject: [PATCH] src/codeconv.c: Fix CVE-2015-8614 + +This code comes from the latest claws-mail upstream which fixes +the security issue. + +Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org> +--- + src/codeconv.c | 74 ++++++++++++++++++++++++++++++++------------------ + 1 file changed, 48 insertions(+), 26 deletions(-) + +diff --git a/src/codeconv.c b/src/codeconv.c +index 254843e..0efbc13 100644 +--- a/src/codeconv.c ++++ b/src/codeconv.c +@@ -128,10 +128,14 @@ typedef enum + void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + { + const guchar *in = inbuf; +- guchar *out = outbuf; ++ gchar *out = outbuf; + JISState state = JIS_ASCII; + +- while (*in != '\0') { ++ /* ++ * Loop outputs up to 3 bytes in each pass (aux kanji) and we ++ * need 1 byte to terminate the output ++ */ ++ while (*in != '\0' && (out - outbuf) < outlen - 4) { + if (*in == ESC) { + in++; + if (*in == '$') { +@@ -192,6 +196,7 @@ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + } + + *out = '\0'; ++ return ; + } + + #define JIS_HWDAKUTEN 0x5e +@@ -263,10 +268,15 @@ static gint conv_jis_hantozen(guchar *outbuf, guchar jis_code, guchar sound_sym) + void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf) + { + const guchar *in = inbuf; +- guchar *out = outbuf; ++ gchar *out = outbuf; + JISState state = JIS_ASCII; + +- while (*in != '\0') { ++ /* ++ * Loop outputs up to 6 bytes in each pass (aux shift + aux ++ * kanji) and we need up to 4 bytes to terminate the output ++ * (ASCII shift + null) ++ */ ++ while (*in != '\0' && (out - outbuf) < outlen - 10) { + if (isascii(*in)) { + K_OUT(); + *out++ = *in++; +@@ -286,26 +296,32 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf) + } + } else if (iseuchwkana1(*in)) { + if (iseuchwkana2(*(in + 1))) { +- guchar jis_ch[2]; +- gint len; +- +- if (iseuchwkana1(*(in + 2)) && +- iseuchwkana2(*(in + 3))) +- len = conv_jis_hantozen +- (jis_ch, +- *(in + 1), *(in + 3)); +- else +- len = conv_jis_hantozen +- (jis_ch, +- *(in + 1), '\0'); +- if (len == 0) +- in += 2; +- else { +- K_IN(); +- in += len * 2; +- *out++ = jis_ch[0]; +- *out++ = jis_ch[1]; +- } ++ if (0) { ++ HW_IN(); ++ in++; ++ *out++ = *in++ & 0x7f; ++ } else { ++ guchar jis_ch[2]; ++ gint len; ++ ++ if (iseuchwkana1(*(in + 2)) && ++ iseuchwkana2(*(in + 3))) ++ len = conv_jis_hantozen ++ (jis_ch, ++ *(in + 1), *(in + 3)); ++ else ++ len = conv_jis_hantozen ++ (jis_ch, ++ *(in + 1), '\0'); ++ if (len == 0) ++ in += 2; ++ else { ++ K_IN(); ++ in += len * 2; ++ *out++ = jis_ch[0]; ++ *out++ = jis_ch[1]; ++ } ++ } + } else { + K_OUT(); + in++; +@@ -340,14 +356,19 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf) + + K_OUT(); + *out = '\0'; ++ return ; + } + + void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + { + const guchar *in = inbuf; +- guchar *out = outbuf; ++ gchar *out = outbuf; + +- while (*in != '\0') { ++ /* ++ * Loop outputs up to 2 bytes in each pass and we need 1 byte ++ * to terminate the output ++ */ ++ while (*in != '\0' && (out - outbuf) < outlen - 3) { + if (isascii(*in)) { + *out++ = *in++; + } else if (issjiskanji1(*in)) { +@@ -386,6 +407,7 @@ void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + } + + *out = '\0'; ++ return ; + } + + void conv_anytoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) diff --git a/x11-misc/macopix/files/macopix-3.4.0-Werror.patch b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch new file mode 100644 index 000000000000..e3f84dba8e37 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch @@ -0,0 +1,11 @@ +--- a/m4/visibility.m4 ++++ b/m4/visibility.m4 +@@ -32,7 +32,7 @@ + AC_MSG_CHECKING([whether the -Werror option is usable]) + AC_CACHE_VAL([gl_cv_cc_vis_werror], [ + gl_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -Werror" ++ CFLAGS="$CFLAGS -Werror -setthisupforfailure" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[]])], + [gl_cv_cc_vis_werror=yes], diff --git a/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch new file mode 100644 index 000000000000..745997046461 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch @@ -0,0 +1,357 @@ +From f29175b892026dbc4a8ad321e426f22e0a09b248 Mon Sep 17 00:00:00 2001 +From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org> +Date: Sat, 8 Aug 2020 03:48:43 +0800 +Subject: [PATCH] Porting to gcc 10 + +GCC will reject multiple definitions of global variables starting +from gcc-10. We need to move the definitions to a real object file. +And in headers we only extern it. + +Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org> +--- + src/main.c | 42 ++++++++++++++++++ + src/main.h | 123 +++++++++++++++++++++++++++++++---------------------- + 2 files changed, 113 insertions(+), 52 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 7944618..ce187a1 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -35,6 +35,48 @@ + // *** GLOBAL ARGUMENT *** + + gboolean FlagInstalledMenu; ++enum MENU_EXT_t MENU_EXT; ++enum MaCoPiXFolder_t MaCoPiXFolder; ++enum ClockMode_t ClockMode; ++enum HomePos_t HomePos; ++enum MoveMode_t MoveMode; ++#ifdef USE_OSX ++enum MAC_LAYER_MODE_t MAC_LAYER_MODE; ++#endif ++enum FFPos_t FFPos; ++enum AutoBar_t AutoBar; ++enum PosBalloon_t PosBalloon; ++enum TypBalloon_t TypBalloon; ++enum DuetAnimeMode_t DuetAnimeMode; ++enum TypInterpolate_t TypInterpolate; ++enum ClockType_t ClockType; ++enum MenuSelect_t MenuSelect; ++enum GuiFontConf_t GuiFontConf; ++enum GuiColorConf_t GuiColorConf; ++enum SetReleaseData_t SetReleaseData; ++enum MailStatus0_t MailStatus0; ++enum MailPixPos_t MailPixPos; ++enum MailStatus_t MailStatus; ++enum SignalAction_t SignalAction; ++enum ConsMode_t ConsMode; ++enum ScanMenuDir_t ScanMenuDir; ++enum CompositeFlag_t CompositeFlag; ++#ifdef USE_GTK3 ++GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal; ++#ifdef USE_WIN32 ++GdkPixbuf *pixbuf_sdw; ++#endif ++#else // USE_GTK3 ++GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal; ++#ifdef USE_WIN32 ++GdkPixmap *pixmap_sdw; ++#endif ++#endif // USE_GTK3 ++gint window_x, window_y; ++gboolean supports_alpha; ++gboolean flag_balloon; ++ ++pid_t http_pid; + + // Prototype of functions in this file + #ifdef USE_GTK3 +diff --git a/src/main.h b/src/main.h +index 496815e..42577a6 100644 +--- a/src/main.h ++++ b/src/main.h +@@ -217,10 +217,11 @@ + #define MENU_EXTRACT_GTAR_COMMAND "tar -zxf %s -C %s " + + // MENU +-enum{ MENU_MENU, ++enum MENU_EXT_t { MENU_MENU, + MENU_LHA, + MENU_TAR +- }MENU_EXT; ++}; ++extern enum MENU_EXT_t MENU_EXT; + + + // 画像ファイル用拡張子 +@@ -252,11 +253,12 @@ enum{ MENU_MENU, + #define SOUNDDIR "sound" G_DIR_SEPARATOR_S + + // Folder +-enum{ FOLDER_DEFAULT, ++enum MaCoPiXFolder_t { FOLDER_DEFAULT, + FOLDER_PIX, + FOLDER_SOUND, + FOLDER_CURRENT +- }MaCoPiXFolder; ++}; ++extern enum MaCoPiXFolder_t MaCoPiXFolder; + + // 個人用セーブファイル + // (USER_DIR中に作成 : マスコット非依存パラメータを保存) +@@ -292,10 +294,11 @@ enum{ FOLDER_DEFAULT, + + + // CLOCK_MODE +-enum{ CLOCK_NO, ++enum ClockMode_t { CLOCK_NO, + CLOCK_PIXMAP, + CLOCK_PANEL +-}ClockMode; ++}; ++extern enum ClockMode_t ClockMode; + + //ANIME + #define MAX_PIXMAP 64 +@@ -330,47 +333,54 @@ enum{ CLOCK_NO, + #define ROOTOFF_Y (-10) + + // Home Position Mode +-enum{ HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR } HomePos; ++enum HomePos_t { HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR }; ++extern enum HomePos_t HomePos; + + // Titlebar Offset for Focus Follow + enum{ FF_BAR_ABS, FF_BAR_REL }; + + + // MOVE mode +-enum{ ++enum MoveMode_t { + MOVE_FIX, + MOVE_FOCUS +-}MoveMode; ++}; ++extern enum MoveMode_t MoveMode; + + #ifdef USE_OSX +-enum { ++enum MAC_LAYER_MODE_t { + MAC_LAYER_DEFAULT, + MAC_LAYER_TOP, + NUM_MAC_LAYER +-}MAC_LAYER_MODE; ++}; ++extern enum MAC_LAYER_MODE_t MAC_LAYER_MODE; + #endif + + // Focus Follow 基準位置 +-enum{ FF_SIDE_LEFT, FF_SIDE_RIGHT } FFPos; ++enum FFPos_t { FF_SIDE_LEFT, FF_SIDE_RIGHT }; ++extern enum FFPos_t FFPos; + + // Focus Autobar タイトルバー算出法 +-enum{ AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ } AutoBar; ++enum AutoBar_t { AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ }; ++extern enum AutoBar_t AutoBar; + + + // Balloon Position +-enum{ ++enum PosBalloon_t{ + BAL_POS_LEFT, + BAL_POS_RIGHT +- } PosBalloon; ++ }; ++extern enum PosBalloon_t PosBalloon; + + // Balloon Mode +-enum{BALLOON_NORMAL, ++enum TypBalloon_t {BALLOON_NORMAL, + BALLOON_MAIL, + BALLOON_POPERROR, + BALLOON_SOCKMSG, + BALLOON_DUET, + BALLOON_SYS +- } TypBalloon; ++ }; ++extern enum TypBalloon_t TypBalloon; + + // Biff用 Balloonの自然消滅コマ数 + #define BALLOON_EXPIRE 150 +@@ -394,39 +404,41 @@ typedef enum { + #define DEF_DUET_DELAY 20 + + // Duet Anime mode +-enum{ ++enum DuetAnimeMode_t { + DUET_CLICK, + DUET_RANDOM +- }DuetAnimeMode; +- ++ }; ++extern enum DuetAnimeMode_t DuetAnimeMode; + + // Interpolation Style for Magnification +-enum{ MAG_IP_NEAREST, ++enum TypInterpolate_t { MAG_IP_NEAREST, + MAG_IP_TILES, + MAG_IP_BILINEAR, + MAG_IP_HYPER +- } TypInterpolate; +- ++ }; ++extern enum TypInterpolate_t TypInterpolate; + + //Clock タイプ +-enum{ CLOCK_TYPE_24S, ++enum ClockType_t { CLOCK_TYPE_24S, + CLOCK_TYPE_24M, + CLOCK_TYPE_12S, +- CLOCK_TYPE_12M } ClockType; +- ++ CLOCK_TYPE_12M }; ++extern enum ClockType_t ClockType; + + // Font size ratio for AM/PM sign + #define CLOCK_AMPM_RATIO 0.6 + + // Install mode +-enum{ MENU_SELECT, ++enum MenuSelect_t { MENU_SELECT, + MENU_INSTALL_USER, + MENU_INSTALL_COMMON, + START_MENU_SELECT, + START_MENU_INSTALL_USER, + START_MENU_INSTALL_COMMON, + NUM_INSTALL_MODE +- } MenuSelect; ++ }; ++extern enum MenuSelect_t MenuSelect; ++ + + //DEFAULT Alpha + #define DEF_ALPHA_MAIN 100 +@@ -542,14 +554,15 @@ static GdkColor color_lred= {0, 0xFFFF, 0xBBBB, 0xBBBB}; + + + // for Callback of Configuration Dialog +-enum{CONF_FONT_CLK, ++enum GuiFontConf_t {CONF_FONT_CLK, + CONF_FONT_BAL, + CONF_DEF_FONT_CLK, + CONF_DEF_FONT_BAL, + INIT_DEF_FONT_CLK, +- INIT_DEF_FONT_BAL} GuiFontConf; ++ INIT_DEF_FONT_BAL}; ++extern enum GuiFontConf_t GuiFontConf; + +-enum{CONF_COLOR_CLK, ++enum GuiColorConf_t {CONF_COLOR_CLK, + CONF_COLOR_CLKBG, + CONF_COLOR_CLKBD, + CONF_COLOR_CLKSD, +@@ -568,19 +581,21 @@ enum{CONF_COLOR_CLK, + CONF_COLOR_FS_BG0, + CONF_COLOR_FS_BG1, + NUM_CONF_COLOR +-} GuiColorConf; +- +-enum{ SET_RELEASE_BALLOON, SET_RELEASE_CLOCK } SetReleaseData; +- ++}; ++extern enum GuiColorConf_t GuiColorConf; + ++enum SetReleaseData_t { SET_RELEASE_BALLOON, SET_RELEASE_CLOCK }; ++extern enum SetReleaseData_t SetReleaseData; + + // Setting for BIFF + #define DEF_MAIL_INTERVAL 60 + + +-enum{ MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL } MailStatus0; ++enum MailStatus0_t { MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL }; ++extern enum MailStatus0_t MailStatus0; + +-enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos; ++enum MailPixPos_t { MAIL_PIX_LEFT, MAIL_PIX_RIGHT }; ++extern enum MailPixPos_t MailPixPos; + + #undef POP_DEBUG /* pop3 debugging mode */ + +@@ -609,7 +624,8 @@ enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos; + #define BIFF_TOOLTIPS TRUE + + +-enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus; ++enum MailStatus_t { NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL }; ++extern enum MailStatus_t MailStatus; + + // mail status; array subscripts + +@@ -637,14 +653,17 @@ enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus; + + + // 時報用設定 +-enum{ SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE } SignalAction; ++enum SignalAction_t { SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE }; ++extern enum SignalAction_t SignalAction; + + + // Consistency Check +-enum{ CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE } ConsMode; ++enum ConsMode_t { CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE }; ++extern enum ConsMode_t ConsMode; + + // メニューの場所 +-enum{ SMENU_DIR_COMMON, SMENU_DIR_USER } ScanMenuDir; ++enum ScanMenuDir_t { SMENU_DIR_COMMON, SMENU_DIR_USER }; ++extern enum ScanMenuDir_t ScanMenuDir; + + + typedef enum { +@@ -661,11 +680,11 @@ typedef enum { + + + // COMPOSITE_FLAG +-enum{ COMPOSITE_FALSE, ++enum CompositeFlag_t { COMPOSITE_FALSE, + COMPOSITE_TRUE, + COMPOSITE_UNKNOWN +-}CompositeFlag; +- ++}; ++extern enum CompositeFlag_t CompositeFlag; + + + +@@ -1137,21 +1156,21 @@ typedef struct{ + + /////////// Global Arguments ////////// + #ifdef USE_GTK3 +-GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal; ++extern GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal; + #ifdef USE_WIN32 +-GdkPixbuf *pixbuf_sdw; ++extern GdkPixbuf *pixbuf_sdw; + #endif + #else // USE_GTK3 +-GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal; ++extern GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal; + #ifdef USE_WIN32 +-GdkPixmap *pixmap_sdw; ++extern GdkPixmap *pixmap_sdw; + #endif + #endif // USE_GTK3 +-gint window_x, window_y; +-gboolean supports_alpha; +-gboolean flag_balloon; ++extern gint window_x, window_y; ++extern gboolean supports_alpha; ++extern gboolean flag_balloon; + +-pid_t http_pid; ++extern pid_t http_pid; + + + /////////// Proto types ////////// diff --git a/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch new file mode 100644 index 000000000000..7d816e7d5e50 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch @@ -0,0 +1,10 @@ +--- a/src/http-client.c ++++ b/src/http-client.c +@@ -516,7 +516,6 @@ + SSL_shutdown(ssl); + SSL_free(ssl); + SSL_CTX_free(ctx); +- ERR_free_strings(); + + close(command_socket); + diff --git a/x11-misc/macopix/files/macopix-3.4.0-windres.patch b/x11-misc/macopix/files/macopix-3.4.0-windres.patch new file mode 100644 index 000000000000..39d509bcd355 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-windres.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -57,7 +57,7 @@ + AC_PROG_YACC + AM_PROG_LIBTOOL + +-AC_CHECK_PROG(WINDRES, windres, windres) ++AC_CHECK_PROG(WINDRES, windres-does-not-exist, windres) + AM_CONDITIONAL(HAVE_WINDRES, test x"$WINDRES" != x) + + # Checks for header files. diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild deleted file mode 100644 index 2d547a63583e..000000000000 --- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application" -HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html" - -BASE_URI="http://rosegray.sakura.ne.jp/macopix" -SRC_URI="${BASE_URI}/${P}.tar.bz2" - -# NOTE: These mascots are not redistributable on commercial CD-ROM. -# The author granted to use them under Gentoo Linux. -MY_MASCOTS=" - macopix-mascot-HxB-euc-ja-0.30 - macopix-mascot-marimite-euc-ja-2.20 - macopix-mascot-cosmos-euc-ja-1.02 - macopix-mascot-mizuiro-euc-ja-1.02 - macopix-mascot-pia2-euc-ja-1.02 - macopix-mascot-tsukihime-euc-ja-1.02 - macopix-mascot-triangle_heart-euc-ja-1.02 - macopix-mascot-comic_party-euc-ja-1.02 - macopix-mascot-kanon-euc-ja-1.02 - macopix-mascot-one-euc-ja-1.02 -" - -for i in ${MY_MASCOTS} ; do - SRC_URI+=" ${BASE_URI}/${i}.tar.gz" -done - -# programme itself is GPL-2, and mascots are free-noncomm -LICENSE="GPL-2 free-noncomm" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="gnutls nls" - -RDEPEND=" - dev-libs/glib:2 - media-libs/libpng:0= - sys-devel/gettext - x11-libs/gtk+:2 - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl:0= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-windres.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - append-libs -lX11 - - econf $(use_with gnutls) -} - -src_install() { - default - - dodoc AUTHORS ChangeLog* NEWS *README* - - # install mascots - for d in ${MY_MASCOTS} ; do - einfo "Installing ${d}..." - cd "${WORKDIR}/${d}" || die - insinto /usr/share/"${PN}" - for i in *.mcpx *.menu ; do - doins "$i" - done - insinto /usr/share/"${PN}"/pixmap - for i in *.png ; do - doins "$i" - done - docinto "${d}" - dodoc README.jp - done -} diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild index 21fa93789d0b..530a80225d7f 100644 --- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild +++ b/x11-misc/macopix/macopix-3.4.0.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic + +inherit autotools DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application" -HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html" +HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX" BASE_URI="http://rosegray.sakura.ne.jp/macopix" -SRC_URI="${BASE_URI}/${P}.tar.bz2" +SRC_URI="${BASE_URI}/${P}.tar.gz" # NOTE: These mascots are not redistributable on commercial CD-ROM. # The author granted to use them under Gentoo Linux. @@ -29,26 +30,31 @@ for i in ${MACOPIX_MASCOTS} ; do SRC_URI+=" ${BASE_URI}/${i}.tar.gz" done -# programme itself is GPL-2, and mascots are free-noncomm +# program itself is GPL-2, and mascots are free-noncomm LICENSE="GPL-2 free-noncomm" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="gnutls nls" RDEPEND=" dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext - x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) + x11-libs/gtk+:3 " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig " + PATCHES=( - "${FILESDIR}"/${P}-windres.patch + "${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch + "${FILESDIR}"/${PN}-3.4.0-Werror.patch + "${FILESDIR}"/${PN}-3.4.0-fno-common.patch + "${FILESDIR}"/${PN}-3.4.0-windres.patch + "${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch ) src_prepare() { @@ -58,10 +64,8 @@ src_prepare() { } src_configure() { - append-cflags -fcommon - append-libs -lX11 - - econf $(use_with gnutls) + econf \ + $(use_with gnutls) } src_install() { diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml index 49c86a887b6a..304da270888c 100644 --- a/x11-misc/macopix/metadata.xml +++ b/x11-misc/macopix/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">chimari/MaCoPiX</remote-id> + </upstream> </pkgmetadata> |