diff options
author | joerg <joerg@pkgsrc.org> | 2017-07-14 12:52:49 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2017-07-14 12:52:49 +0000 |
commit | b772c5b9da7f9cb6e868217fbbadf6611c4db8ff (patch) | |
tree | 88772eff58fff3fec295c42f7bb271ac6fc4cb50 /wm/afterstep | |
parent | d37f1ed547374f62c82f17ca586a765468f6c6cd (diff) | |
download | pkgsrc-b772c5b9da7f9cb6e868217fbbadf6611c4db8ff.tar.gz |
Fix unused function to at least compile on NetBSD. Fix C99 inline use.
Diffstat (limited to 'wm/afterstep')
-rw-r--r-- | wm/afterstep/distinfo | 4 | ||||
-rw-r--r-- | wm/afterstep/patches/patch-libAfterBase_selfdiag.c | 31 | ||||
-rw-r--r-- | wm/afterstep/patches/patch-libAfterStep_colorscheme.c | 15 |
3 files changed, 49 insertions, 1 deletions
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo index 7409c343697..a251289a751 100644 --- a/wm/afterstep/distinfo +++ b/wm/afterstep/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/05/01 19:30:58 dholland Exp $ +$NetBSD: distinfo,v 1.22 2017/07/14 12:52:49 joerg Exp $ SHA1 (AfterStep-2.2.11.tar.bz2) = ecfd815b659046281530441af0bc4fc42900d0da RMD160 (AfterStep-2.2.11.tar.bz2) = a82a4b3fddcbcd97862212669c11d14629e51a4d @@ -13,12 +13,14 @@ SHA1 (patch-libAfterBase_asvector.h) = f1c775e576dcdbbd8fa73a4fd362dc6e17d84b58 SHA1 (patch-libAfterBase_output.c) = fe0d9b4cbe3c2d1eac50e4c4c0d6fbd3b8b7487f SHA1 (patch-libAfterBase_parse.c) = aba8ed0b11821ed09ded8833140c250abf6ea6da SHA1 (patch-libAfterBase_parse.h) = 5e2e0a1b3351f7d3b7d84076879e3827d47e3f24 +SHA1 (patch-libAfterBase_selfdiag.c) = 72fa80bb37f8c73bcf27eb9c0a7b65af561d2e96 SHA1 (patch-libAfterConf_Color.c) = 346f16a2ea539cb0ff352b73ba1f60d522efea00 SHA1 (patch-libAfterConf_DesktopEntry.c) = 57b8ff21093434434711d05ad2054c1415de0ca3 SHA1 (patch-libAfterImage_asfont.c) = 4fd6498495855c2909530ac5e34accb715b48497 SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366 SHA1 (patch-libAfterImage_import.c) = 57fdfec498ba05aa6d52470c545d1c9958095435 SHA1 (patch-libAfterStep_asapp.c) = 3d23d40b862aca272aac3e35574f6bf99cbc8e0a +SHA1 (patch-libAfterStep_colorscheme.c) = cb5c06e36016d198c3508dfbec1d0743231cc7eb SHA1 (patch-libAfterStep_font.c) = e47477b5d0a0b54af19d603eb37937dbfa24dd19 SHA1 (patch-libAfterStep_freestor.c) = e66249ff9edc2f7441e406aa34db923420b201d6 SHA1 (patch-libAfterStep_functions.c) = a01482b2eff7d659afc98aa028191cca65465d0b diff --git a/wm/afterstep/patches/patch-libAfterBase_selfdiag.c b/wm/afterstep/patches/patch-libAfterBase_selfdiag.c new file mode 100644 index 00000000000..c54b4262017 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterBase_selfdiag.c @@ -0,0 +1,31 @@ +$NetBSD: patch-libAfterBase_selfdiag.c,v 1.1 2017/07/14 12:52:49 joerg Exp $ + +Provide something at least sensible, even though the function seems to be +unused. + +--- libAfterBase/selfdiag.c.orig 2017-07-12 21:29:50.328824882 +0000 ++++ libAfterBase/selfdiag.c +@@ -52,6 +52,9 @@ + + #ifdef HAVE_ELF_H + # include <elf.h> ++# ifdef __NetBSD__ ++# include <dlfcn.h> ++# endif + #endif + + #include <signal.h> +@@ -97,6 +100,13 @@ get_proc_tables (proc_tables * ptabs) + # if (defined(HAVE_ELF32_DYN_D_TAG) || defined(HAVE_ELF64_DYN_D_TAG)) && HAVE_DECL_ELFW + ElfW (Dyn) * dyn; + ++# ifdef __NetBSD__ ++ const struct link_map *map; ++ if (dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map)) ++ return; ++ void *_DYNAMIC = map->l_ld; ++#endif ++ + memset (ptabs, 0x00, sizeof (proc_tables)); + for (dyn = _DYNAMIC; dyn != NULL && dyn->d_tag != DT_NULL; ++dyn) + switch (dyn->d_tag) diff --git a/wm/afterstep/patches/patch-libAfterStep_colorscheme.c b/wm/afterstep/patches/patch-libAfterStep_colorscheme.c new file mode 100644 index 00000000000..9c270b1d938 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterStep_colorscheme.c @@ -0,0 +1,15 @@ +$NetBSD: patch-libAfterStep_colorscheme.c,v 1.1 2017/07/14 12:52:49 joerg Exp $ + +Fix build with C99 inline. + +--- libAfterStep/colorscheme.c.orig 2017-07-12 21:35:22.546616813 +0000 ++++ libAfterStep/colorscheme.c +@@ -122,7 +122,7 @@ compare_color_lightness( ARGB32 c1, ARGB + return ASCS_BLACK_O_WHITE_CRITERIA16_VAL( red1, green1, blue1 )-ASCS_BLACK_O_WHITE_CRITERIA16_VAL( red2, green2, blue2 ); + } + +-inline void ++static inline void + make_grad_argb( ASColorScheme *cs, int id, ARGB32 base_alpha16, int hue360, int sat100, int val100, Bool base ) + { + int dark_val = val100-ASCS_GRADIENT_BRIGHTNESS_OFFSET ; |