diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-01-07 06:41:06 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-07 06:41:06 +0000 |
commit | d69399c7befdd98cda62d6a1788ae2aa7f104c5e (patch) | |
tree | eac7184f4cfe7d67580c1d0a0d9942a91e6cb4ee /dev-java/swt | |
parent | e4d9d6796d5018e338f0b27a3bc97716195bf0b8 (diff) |
gentoo auto-resync : 07:01:2025 - 06:41:06
Diffstat (limited to 'dev-java/swt')
-rw-r--r-- | dev-java/swt/Manifest | 10 | ||||
-rw-r--r-- | dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch | 243 | ||||
-rw-r--r-- | dev-java/swt/files/swt-3.7-manifest | 17 | ||||
-rw-r--r-- | dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch | 121 | ||||
-rw-r--r-- | dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch | 121 | ||||
-rw-r--r-- | dev-java/swt/swt-3.7.2-r4.ebuild | 169 | ||||
-rw-r--r-- | dev-java/swt/swt-4.34.ebuild | 4 |
7 files changed, 3 insertions, 682 deletions
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 9e08eb270381..16bcc2d37e25 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,13 +1,6 @@ -AUX as-needed-and-flag-fixes-3.6.patch 7617 BLAKE2B 263499f0a475a025c4ecee1aafe37bc89396e482e475b65009004b5bbebffd278725277d042556a4c3f5594f091b63c2c26457f1761ce220df5ff949d0c51cf2 SHA512 d8d8ed07e851aba551a671278e4fc027ef8cab7b3d9d07e7c56e27da0959feed9d1eb87ec73963b52705a3087020959d89f61798ce8c474add7c481a1c505a32 -AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f -AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7 -AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30330339da12ffac079eaf616cf1f2e9a3a8e984789d38c43019ade81d9a5a444b0a763df3026732dbc515a3a6b329efb5 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d AUX swt-4.10-as-needed-and-flag-fixes.patch 2530 BLAKE2B 7ed3d847cd56b0157e72dd08509d57709778ff08f0936e09e56f1ee2f50a2938c58fdfb1969b0ccfd2558d5d84dce0b55b183d08f05e492c5dae641fcd347703 SHA512 af789458ab106330955c772245aa2603d3fb7b2037ef6bbdfd535361007d9f61dbda9ba81774e8ea0b8e5c14eeb5db3d5bf188feae164141aab0f1ea65410fe5 AUX swt-4.10-manifest 739 BLAKE2B d70c6bbecc6741cff4889005f13adab95d59ef7ff4604bf0ca4482422cb6d4e6f0766e1a01bd9779c3acab3d5b1d382b193b93c44f00ad37317aa6b9308f1088 SHA512 dba2b208fb925cdc43dd64c0900b5c8e8d2ffdea06a9f4f49648d9aa6625481b8316c654d07a1b059385c9546f4929a747a69107415028b0fa0247a7619538ce AUX swt-4.27-as-needed-and-flag-fixes.patch 2918 BLAKE2B 9411f03dfbc9dc55fb567385bcb5e87cb949d8babd611d99f6643c2c3e1cd79053433b0c87c0ef5efcabf9a07e31995b74ffad1f7433f40bb8ffaf9170dd5afb SHA512 ee0516dbb759f8981538eb55f2008af29641156a90435e2d24f54598bdc288f5eade58356358c42d404527fafc366e0f878c6fe3ceea0805849bb3d171663b85 -DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 -DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 -DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 @@ -29,7 +22,6 @@ DIST swt-4.34-gtk-linux-aarch64.zip 4001004 BLAKE2B 4ed2ba9b61cecfda5bad8a3701dc DIST swt-4.34-gtk-linux-ppc64le.zip 4038598 BLAKE2B 8dd08a73c06c99cf286a894fbe42f8eb74592e4a42d03e184bc8941d067f564e2a1f13d27436ae7e0be44f5a28a0e2124d49dbae6261d841b39d832d3024e31e SHA512 c7c9048f1fc3730f27926d606301100c491b44ee5bab594d4a52bda8f0652302b0954b91d86bd7418532d596c332235a044f04bc677e4e36f33d316819a2a44b DIST swt-4.34-gtk-linux-riscv64.zip 4009994 BLAKE2B a7f4d3f830df978b31c0d0f07c8c3db2cbf222d8aa72d7dffd178b6c51b3e93e474eb76a78413518acda64d3e55ceab224d597733887a5bdd0ec4c73c9cc407b SHA512 abd2912878bad153b7e2cf15bdc68c713aa7fd5e33bed5569f4a2400f25f6342e95453a2331ce610905f0f8e0d171841b69e7fc50d43a07edd1f7a05f0a27815 DIST swt-4.34-gtk-linux-x86_64.zip 4021887 BLAKE2B b9d549db7e143ea79200355e59e393a1305fd30cedfe39d94cd2f02947a62a1a2dc8bea45726e59dddd2360117e8ae757b3f597a37d84bed4e88bf8d4f957797 SHA512 486e18d150e23adb197e2f88448a1c7a48d8ef0d20751b358975460b21792f59a2d7ee55ad2340de381deb5d5508dada2e01087e58fa64690a92271bd3bbc7e7 -EBUILD swt-3.7.2-r4.ebuild 4436 BLAKE2B 2e50500e84ddd46fec47b576f0cdb25e5b6fd8e2312cc2ce609ef52f334433df597de8f18ae80e5a258f44d33d361577cdba218b4bd4029867331bdf29bb7e27 SHA512 829ca9a7743380909c5721c0befc4d08b17320804b9a1b1d01ab6aa39475ed9d96b238e537bc53f30be0ce8f1b0ec3dcf611779b874fc7b98a916c780c856dcc EBUILD swt-4.10-r4.ebuild 4269 BLAKE2B 3ef14892698d8df50f090443a8e15f8b0a048b378f5a5a15d9430f3cd2aba36f68d3556444ba43f5e538c5841dc93717ecf91f032bc7cccce98e3a74ca3e12c1 SHA512 79b77fcb263f657fc386b887e1d815165cf87af5bc32ece128eef71845746173cac16cdfb42277e803244d3f507b618c424b65a5e079cbaef57fcaa4932c1070 EBUILD swt-4.29-r1.ebuild 3456 BLAKE2B 6d48de8cc8e1d9c034fafe3ca67951bf0c59201229a066566732b6828da068a1f6265e7367c9853da795d0ac25db981a6afb1d4691daa47bd372ec89bc10e5e3 SHA512 9c6902c16813aa36289b4131d5a379ab3e937246a18f486fb3a945f0fc240e67bb37b1a9245903fbda0837524c92f917951a3599c472c222e7f6e3001a90304a EBUILD swt-4.30-r2.ebuild 3526 BLAKE2B 7d7d2f4af8b64b169daaff9486311d50324170cfabfa948f0b3029a77ba487fa2953d8c531260a5db1bc8185449ca6126a4693f8cc30cdd5ecdbb572dae896f8 SHA512 0256a8bc0e5b16cf3e50f81cbef51f9ef7b8c91f1e006ceb020d11026d19317459e1148c655eb68e05b75bd8601de8372e7ce6ae38dd695e70465a9b02d8ab07 @@ -37,5 +29,5 @@ EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c EBUILD swt-4.33.ebuild 3597 BLAKE2B c078bc253f2c56298421dc2c59efb9928b2ee058bf95929d847d52e113f488e1799a6cd56be0a38c802fa6450a3a353c518e5f13104eb174295cc218f65b1358 SHA512 c331378ea4954e967c83ced0cbb3cd1d24e16a75a3b972ae707860efd240ec001818e961fe92f733b5826e95a0142b0bf0807b6a9b32c997d97bd62d1df4eedb EBUILD swt-4.34-r1.ebuild 3652 BLAKE2B 245aaaf87401e7ea5f8719f3ac221599c7826e313c206a8f579efa5fe9a56b8de76e36b931ffc70d94f790f8d0217fdaecec26895153fe225483e468812b624e SHA512 25b28ce7af6079c58b9c0bd23bb3808b432845b0c0511dc8d695a89a8b4d48edbd11ae26e2d47cee7e24c6bce0033095da78bb7247de2b1332ab40d93762f4d9 -EBUILD swt-4.34.ebuild 3600 BLAKE2B 93023804243f31104a7c0d08a1eaae8418c93f036a8ea52f06f7e4864119063b3d64b82e8a8f010b1ca47387733cef6658f729f1faab0c14ccc1c26df0c65b67 SHA512 86cfb49c4afeeb87a135ebf8bb1f46e873a0a737aaf5e44927444791e26512e3ed7a39063f90b9e3af8a9135d6d4eb38d6754a9264de56537b2bb467fcc0692e +EBUILD swt-4.34.ebuild 3599 BLAKE2B c3436d90ef7496df47eb26be2770c0e39f269792096e671aee488f8104fdbff9a3ab43a1964d1618d661673e37b52c3d4656e08a47ec0e271504296afdfcc737 SHA512 d4b093e57dd915ff081d3ccbd8d46bc351cb8445eb737b6511a583bfc9a0660996aa965b0ce5dd1013344b44df801336ea5e346ea0121e7efe02e438881d8615 MISC metadata.xml 762 BLAKE2B 6d1ffda9ea96f50b3e4736513ca9a3af4e7e9d3cd59a3f8ff8efcae118d290d141ffa90181fb1669f9a4380c6e4c618d780b459ada909c5dd5aa4f5fc1865b7d SHA512 5c50e0d80478a6af08886d9b65230fc161a000a7ea39d0ffa873114e13fd1fb9bcbcc554df41eebd63ee60dd9ed14e6f19110e71a49bd32adef6c43051c2c380 diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch deleted file mode 100644 index d6cc763ea968..000000000000 --- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch +++ /dev/null @@ -1,243 +0,0 @@ ---- a/make_linux.mak -+++ b/make_linux.mak -@@ -66,7 +66,7 @@ - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS - --MOZILLACFLAGS = -O \ -+MOZILLACFLAGS = $(CXXFLAGS) \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DMOZILLA_STRICT_API=1 \ -@@ -107,7 +107,7 @@ - WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - --CFLAGS = -O -Wall \ -+CFLAGS += \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DLINUX -DGTK \ -@@ -131,13 +131,13 @@ - make_swt: $(SWT_LIB) $(SWTPI_LIB) - - $(SWT_LIB): $(SWT_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) - - callback.o: callback.c callback.h - $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c - - $(SWTPI_LIB): $(SWTPI_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) - - swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -@@ -156,7 +156,7 @@ - make_cairo: $(CAIRO_LIB) - - $(CAIRO_LIB): $(CAIRO_OBJECTS) -- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) - - cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -172,7 +172,7 @@ - make_cde: $(CDE_LIB) - - $(CDE_LIB): $(CDE_OBJECTS) -- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) - - # - # AWT lib -@@ -180,7 +180,7 @@ - make_awt:$(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) -- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) - - # - # Atk lib -@@ -188,7 +188,7 @@ - make_atk: $(ATK_LIB) - - $(ATK_LIB): $(ATK_OBJECTS) -- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) - - atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -205,7 +205,7 @@ - make_gnome: $(GNOME_LIB) - - $(GNOME_LIB): $(GNOME_OBJECTS) -- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) - - gnome.o: gnome.c - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c -@@ -222,7 +222,7 @@ - make_mozilla:$(MOZILLA_LIB) - - $(MOZILLA_LIB): $(MOZILLA_OBJECTS) -- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} -+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp -@@ -242,7 +242,7 @@ - make_xulrunner:$(XULRUNNER_LIB) - - $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) -- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp -@@ -262,7 +262,7 @@ - make_xpcominit:$(XPCOMINIT_LIB) - - $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) -- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcominit.o: xpcominit.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp -@@ -279,7 +279,7 @@ - make_webkit: $(WEBKIT_LIB) - - $(WEBKIT_LIB): $(WEBKIT_OBJECTS) -- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) - - webkit.o: webkitgtk.c - $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o -@@ -296,7 +296,7 @@ - make_glx: $(GLX_LIB) - - $(GLX_LIB): $(GLX_OBJECTS) -- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) - - glx.o: glx.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c ---- a/make_freebsd.mak -+++ b/make_freebsd.mak -@@ -64,7 +64,7 @@ - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS - --MOZILLACFLAGS = -O \ -+MOZILLACFLAGS += \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DMOZILLA_STRICT_API=1 \ -@@ -91,7 +91,7 @@ - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - --CFLAGS = -O -Wall \ -+CFLAGS += \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DFREEBSD -DGTK \ -@@ -115,13 +115,13 @@ - make_swt: $(SWT_LIB) $(SWTPI_LIB) - - $(SWT_LIB): $(SWT_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) - - callback.o: callback.c callback.h - $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c - - $(SWTPI_LIB): $(SWTPI_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) - - swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -@@ -140,7 +140,7 @@ - make_cairo: $(CAIRO_LIB) - - $(CAIRO_LIB): $(CAIRO_OBJECTS) -- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) - - cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -156,7 +156,7 @@ - make_cde: $(CDE_LIB) - - $(CDE_LIB): $(CDE_OBJECTS) -- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) - - # - # AWT lib -@@ -164,7 +164,7 @@ - make_awt:$(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) -- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) - - # - # Atk lib -@@ -172,7 +172,7 @@ - make_atk: $(ATK_LIB) - - $(ATK_LIB): $(ATK_OBJECTS) -- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) - - atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -189,7 +189,7 @@ - make_gnome: $(GNOME_LIB) - - $(GNOME_LIB): $(GNOME_OBJECTS) -- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) - - gnome.o: gnome.c - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c -@@ -206,7 +206,7 @@ - make_mozilla:$(MOZILLA_LIB) - - $(MOZILLA_LIB): $(MOZILLA_OBJECTS) -- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} -+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp -@@ -226,7 +226,7 @@ - make_xulrunner:$(XULRUNNER_LIB) - - $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) -- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp -@@ -252,7 +252,7 @@ - make_xpcominit:$(XPCOMINIT_LIB) - - $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) -- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcominit.o: xpcominit.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp -@@ -269,7 +269,7 @@ - make_glx: $(GLX_LIB) - - $(GLX_LIB): $(GLX_OBJECTS) -- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) - - glx.o: glx.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c diff --git a/dev-java/swt/files/swt-3.7-manifest b/dev-java/swt/files/swt-3.7-manifest deleted file mode 100644 index bddcbb48b041..000000000000 --- a/dev-java/swt/files/swt-3.7-manifest +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true -Bundle-Version: 3.7 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH)) -Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true, - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.cde; x-internal:=true, - org.eclipse.swt.internal.gnome; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, - org.eclipse.swt.internal.opengl.glx; x-internal:=true - org.eclipse.swt.internal.webkit; x-internal:=true - diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch deleted file mode 100644 index cab0e0cdb573..000000000000 --- a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch +++ /dev/null @@ -1,121 +0,0 @@ -Program.launch will first attempt to open files using libgio and then fallback -to gnome-vfs. gio_launch uses g_file_new_for_path which fails when passed a -URI. If swt was built with USE="-gnome" then the fallback fails as well, -making it appear that a package has a dependency on swt[gnome] when it does -not. - -Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: - no swt-gnome-gtk-3740 in java.library.path - no swt-gnome-gtk in java.library.path - Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so - Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so - -Use g_file_new_for_commandline_arg instead. - -https://bugs.gentoo.org/424151 - - ---- a/os.c -+++ b/os.c -@@ -3059,6 +3059,30 @@ fail: - } - #endif - -+#ifndef NO__1g_1file_1new_1for_1commandline_1arg -+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg) -+ (JNIEnv *env, jclass that, jbyteArray arg0) -+{ -+ jbyte *lparg0=NULL; -+ jintLong rc = 0; -+ OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -+/* -+ rc = (jintLong)g_file_new_for_commandline_arg(lparg0); -+*/ -+ { -+ LOAD_FUNCTION(fp, g_file_new_for_commandline_arg) -+ if (fp) { -+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); -+ } -+ } -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); -+ OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC); -+ return rc; -+} -+#endif -+ - #ifndef NO__1g_1file_1new_1for_1path - JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path) - (JNIEnv *env, jclass that, jbyteArray arg0) ---- a/os_custom.h -+++ b/os_custom.h -@@ -280,6 +280,7 @@ - #define g_file_icon_get_file_LIB LIB_GIO - #define g_file_info_get_content_type_LIB LIB_GIO - #define g_file_info_get_modification_time_LIB LIB_GIO -+#define g_file_new_for_commandline_arg_LIB LIB_GIO - #define g_file_new_for_path_LIB LIB_GIO - #define g_file_new_for_uri_LIB LIB_GIO - #define g_file_read_LIB LIB_GIO ---- a/os_stats.c -+++ b/os_stats.c -@@ -18,8 +18,8 @@ - - #ifdef NATIVE_STATS - --int OS_nativeFunctionCount = 1396; --int OS_nativeFunctionCallCount[1396]; -+int OS_nativeFunctionCount = 1397; -+int OS_nativeFunctionCallCount[1397]; - char * OS_nativeFunctionNames[] = { - #ifndef JNI64 - "Call__IIII", -@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = { - "_1g_1file_1icon_1get_1file", - "_1g_1file_1info_1get_1content_1type", - "_1g_1file_1info_1get_1modification_1time", -+ "_1g_1file_1new_1for_1commandline_1arg", - "_1g_1file_1new_1for_1path", - "_1g_1file_1new_1for_1uri", - "_1g_1file_1query_1info", ---- a/os_stats.h -+++ b/os_stats.h -@@ -258,6 +258,7 @@ typedef enum { - _1g_1file_1icon_1get_1file_FUNC, - _1g_1file_1info_1get_1content_1type_FUNC, - _1g_1file_1info_1get_1modification_1time_FUNC, -+ _1g_1file_1new_1for_1commandline_1arg_FUNC, - _1g_1file_1new_1for_1path_FUNC, - _1g_1file_1new_1for_1uri_FUNC, - _1g_1file_1query_1info_FUNC, ---- a/src/org/eclipse/swt/internal/gtk/OS.java -+++ b/src/org/eclipse/swt/internal/gtk/OS.java -@@ -2113,6 +2113,16 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) { - } - } - /** @method flags=dynamic */ -+public static final native int /*long*/ _g_file_new_for_commandline_arg(byte[] fileName); -+public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName) { -+ lock.lock(); -+ try { -+ return _g_file_new_for_commandline_arg(fileName); -+ } finally { -+ lock.unlock(); -+ } -+} -+/** @method flags=dynamic */ - public static final native int /*long*/ _g_file_new_for_uri(byte[] fileName); - public static final int /*long*/ g_file_new_for_uri(byte[] fileName) { - lock.lock(); ---- a/src/org/eclipse/swt/program/Program.java -+++ b/src/org/eclipse/swt/program/Program.java -@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) { - static boolean gio_launch(String fileName) { - boolean result = false; - byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true); -- int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer); -+ int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer); - if (file != 0) { - int /*long*/ uri = OS.g_file_get_uri (file); - if (uri != 0) { diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch deleted file mode 100644 index bbb28573072b..000000000000 --- a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch +++ /dev/null @@ -1,121 +0,0 @@ -Program.launch will first attempt to open files using libgio and then fallback -to gnome-vfs. gio_launch uses g_file_new_for_path which fails when passed a -URI. If swt was built with USE="-gnome" then the fallback fails as well, -making it appear that a package has a dependency on swt[gnome] when it does -not. - -Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: - no swt-gnome-gtk-3740 in java.library.path - no swt-gnome-gtk in java.library.path - Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so - Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so - -Use g_file_new_for_commandline_arg instead. - -https://bugs.gentoo.org/424151 - - ---- a/os.c -+++ b/os.c -@@ -3059,6 +3059,30 @@ fail: - } - #endif - -+#ifndef NO__1g_1file_1new_1for_1commandline_1arg -+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg) -+ (JNIEnv *env, jclass that, jbyteArray arg0) -+{ -+ jbyte *lparg0=NULL; -+ jintLong rc = 0; -+ OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC); -+ if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -+/* -+ rc = (jintLong)g_file_new_for_commandline_arg(lparg0); -+*/ -+ { -+ LOAD_FUNCTION(fp, g_file_new_for_commandline_arg) -+ if (fp) { -+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); -+ } -+ } -+fail: -+ if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); -+ OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC); -+ return rc; -+} -+#endif -+ - #ifndef NO__1g_1file_1new_1for_1path - JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path) - (JNIEnv *env, jclass that, jbyteArray arg0) ---- a/os_custom.h -+++ b/os_custom.h -@@ -280,6 +280,7 @@ - #define g_file_icon_get_file_LIB LIB_GIO - #define g_file_info_get_content_type_LIB LIB_GIO - #define g_file_info_get_modification_time_LIB LIB_GIO -+#define g_file_new_for_commandline_arg_LIB LIB_GIO - #define g_file_new_for_path_LIB LIB_GIO - #define g_file_new_for_uri_LIB LIB_GIO - #define g_file_read_LIB LIB_GIO ---- a/os_stats.c -+++ b/os_stats.c -@@ -18,8 +18,8 @@ - - #ifdef NATIVE_STATS - --int OS_nativeFunctionCount = 1396; --int OS_nativeFunctionCallCount[1396]; -+int OS_nativeFunctionCount = 1397; -+int OS_nativeFunctionCallCount[1397]; - char * OS_nativeFunctionNames[] = { - #ifndef JNI64 - "Call__IIII", -@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = { - "_1g_1file_1icon_1get_1file", - "_1g_1file_1info_1get_1content_1type", - "_1g_1file_1info_1get_1modification_1time", -+ "_1g_1file_1new_1for_1commandline_1arg", - "_1g_1file_1new_1for_1path", - "_1g_1file_1new_1for_1uri", - "_1g_1file_1query_1info", ---- a/os_stats.h -+++ b/os_stats.h -@@ -258,6 +258,7 @@ typedef enum { - _1g_1file_1icon_1get_1file_FUNC, - _1g_1file_1info_1get_1content_1type_FUNC, - _1g_1file_1info_1get_1modification_1time_FUNC, -+ _1g_1file_1new_1for_1commandline_1arg_FUNC, - _1g_1file_1new_1for_1path_FUNC, - _1g_1file_1new_1for_1uri_FUNC, - _1g_1file_1query_1info_FUNC, ---- a/src/org/eclipse/swt/internal/gtk/OS.java -+++ b/src/org/eclipse/swt/internal/gtk/OS.java -@@ -2113,6 +2113,16 @@ public static final long /*int*/ g_file_new_for_path(byte[] fileName) { - } - } - /** @method flags=dynamic */ -+public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName); -+public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) { -+ lock.lock(); -+ try { -+ return _g_file_new_for_commandline_arg(fileName); -+ } finally { -+ lock.unlock(); -+ } -+} -+/** @method flags=dynamic */ - public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName); - public static final long /*int*/ g_file_new_for_uri(byte[] fileName) { - lock.lock(); ---- a/src/org/eclipse/swt/program/Program.java -+++ b/src/org/eclipse/swt/program/Program.java -@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) { - static boolean gio_launch(String fileName) { - boolean result = false; - byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true); -- long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer); -+ long /*int*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer); - if (file != 0) { - long /*int*/ uri = OS.g_file_get_uri (file); - if (uri != 0) { diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild deleted file mode 100644 index 2fc62ad8c429..000000000000 --- a/dev-java/swt/swt-3.7.2-r4.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple java-osgi toolchain-funcs - -MY_PV="${PV/_rc/RC}" -MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/swt/" -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip ) - x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="3.7" -KEYWORDS="amd64 ppc64" -IUSE="cairo opengl" - -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" -COMMON_DEPEND=" - app-accessibility/at-spi2-core:2 - dev-libs/glib - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - )" -DEPEND="${COMMON_DEPEND} - >=virtual/jdk-1.8:*[-headless-awt] - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst" -RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.8:*" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/lib.*/libswt-.*.so" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="src" - -PATCHES=( - # Fix Makefiles to respect flags and work with --as-needed - "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch -) - -src_unpack() { - default - unpack "./src.zip" -} - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - mkdir resources src || die "mkdir failed" - mv org src || die "moving java sources failed" - - case ${ARCH} in - ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; - *) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;; - esac - - pushd src > /dev/null || die - find -type f ! -name '*.java' \ - | xargs \ - cp --parent -t ../resources -v \ - || die "copying resources failed" - popd > /dev/null || die - cp version.txt resources || die "adding version.txt failed" -} - -src_compile() { - local AWT_ARCH - local JAWTSO="libjawt.so" -# if [[ $(tc-arch) == 'x86' ]] ; then -# AWT_ARCH="i386" -# elif [[ $(tc-arch) == 'ppc' ]] ; then -# AWT_ARCH="ppc" -# elif [[ $(tc-arch) == 'ppc64' ]] ; then -# AWT_ARCH="ppc64" -# else -# AWT_ARCH="amd64" -# fi -# if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then -# export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" -# elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then -# export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" -# elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then -# export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" -# else - IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) - - for libpath in "${ldpaths[@]}"; do - if [[ -f "${libpath}/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${libpath}" - break - # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 - elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${libpath}/$(tc-arch)" - break - fi - done - - if [[ -z "${AWT_LIB_PATH}" ]]; then - eerror "${JAWTSO} not found in the JDK being used for compilation!" - die "cannot build AWT library" - fi - - # Fix the pointer size for AMD64 - [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 - - local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" - - einfo "Building AWT library" - ${make} make_awt - - einfo "Building SWT library" - ${make} make_swt - - einfo "Building JAVA-AT-SPI bridge" - ${make} make_atk - - if use cairo ; then - einfo "Building CAIRO support" - ${make} make_cairo - fi - - if use opengl ; then - einfo "Building OpenGL component" - ${make} make_glx - fi - - java-pkg-simple_src_compile -} - -src_install() { - swtArch=${ARCH} - use amd64 && swtArch=x86_64 - - sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die - use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF" - sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF" - sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" - - java-pkg_sointo /usr/$(get_libdir) - java-pkg_doso *.so - - docinto html - dodoc about.html -} diff --git a/dev-java/swt/swt-4.34.ebuild b/dev-java/swt/swt-4.34.ebuild index 78532d57cbf3..33b2ac1eeb71 100644 --- a/dev-java/swt/swt-4.34.ebuild +++ b/dev-java/swt/swt-4.34.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.34" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" BDEPEND=" |