From 46768830ae8fa0a6d59cb4761976348964ff662e Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 3 Oct 2018 21:02:25 +0300 Subject: [PATCH] fix names for more packages Now x11-packages repository will use original names for packages. For example, libgtk2 now will be provided as gtk2, libgtk3 will be available as gtk3, libsdl - as sdl. List of changed packages: libatk --> atk libglu --> glu libgtk2 --> gtk2 libgtk3 --> gtk3 libmesa --> mesa libsdl --> sdl libsdl2 --> sdl2 libsdl-net --> sdl-net riscvemu-sdl --> riscvemu xorg-xvfb --> xorg-server-xvfb List of dependent packages (should be rebuilt with new deps): dosbox, emacs-x, galculator, geany, libepoxy, mtpaint, qemu-system-x86_64, the-powder-toy, tigervnc, wireshark-gtk, xarchiver. Note: depending on which packages are installed, it may be necessary to upgrade with 'apt dist-upgrade'. --- x11-packages/{libatk => atk}/build.sh | 10 ++++++---- x11-packages/dosbox/build.sh | 10 ++++++++-- x11-packages/emacs-x/build.sh | 4 ++-- x11-packages/galculator/build.sh | 4 ++-- x11-packages/geany/build.sh | 4 ++-- x11-packages/{libglu => glu}/build.sh | 6 +++++- x11-packages/{libgtk2 => gtk2}/build.sh | 9 ++++++--- .../gtk-2.24.32_demos_testpixbuf-color.c.patch | 0 .../gtk-2.24.32_docs_tools_widgets.c.patch | 0 .../gtk-2.24.32_gtk_gtkfilesel.c.patch | 0 .../gtk-2.24.32_gtk_tests_filechooser.c.patch | 0 ...ntbackends_cups_gtkprintbackendcups.c.patch | 0 .../gtk-2.24.32_tests_testfilechooser.c.patch | 0 x11-packages/{libgtk2 => gtk2}/postinst | 0 x11-packages/{libgtk2 => gtk2}/postrm | 0 x11-packages/{libgtk2 => gtk2}/triggers | 0 .../xid-collision-debug.patch | 0 x11-packages/{libgtk3 => gtk3}/build.sh | 18 +++++++++++++++--- .../gtk-3.22.30_ABOUT-NLS.patch | 0 .../gtk-3.22.30_INSTALL.patch | 0 .../gtk-3.22.30_Makefile.in.patch | 0 .../gtk-3.22.30_aclocal.m4.patch | 0 .../gtk-3.22.30_autom4te.cache_output.0.patch | 0 .../gtk-3.22.30_autom4te.cache_output.1.patch | 0 .../gtk-3.22.30_autom4te.cache_output.2.patch | 0 .../gtk-3.22.30_autom4te.cache_output.3.patch | 0 .../gtk-3.22.30_autom4te.cache_requests.patch | 0 .../gtk-3.22.30_autom4te.cache_traces.0.patch | 0 .../gtk-3.22.30_autom4te.cache_traces.1.patch | 0 .../gtk-3.22.30_autom4te.cache_traces.2.patch | 0 .../gtk-3.22.30_autom4te.cache_traces.3.patch | 0 .../gtk-3.22.30_build-aux_compile.patch | 0 .../gtk-3.22.30_build-aux_config.guess.patch | 0 .../gtk-3.22.30_build-aux_config.rpath.patch | 0 .../gtk-3.22.30_build-aux_config.sub.patch | 0 .../gtk-3.22.30_build-aux_depcomp.patch | 0 .../gtk-3.22.30_build-aux_install-sh.patch | 0 .../gtk-3.22.30_build-aux_ltmain.sh.patch | 0 .../gtk-3.22.30_build-aux_missing.patch | 0 .../gtk-3.22.30_build_Makefile.in.patch | 0 .../gtk-3.22.30_build_win32_Makefile.in.patch | 0 ...-3.22.30_build_win32_vs10_Makefile.in.patch | 0 ...-3.22.30_build_win32_vs11_Makefile.in.patch | 0 ...-3.22.30_build_win32_vs12_Makefile.in.patch | 0 ...-3.22.30_build_win32_vs14_Makefile.in.patch | 0 ...-3.22.30_build_win32_vs15_Makefile.in.patch | 0 ...k-3.22.30_build_win32_vs9_Makefile.in.patch | 0 .../gtk-3.22.30_config.h.in.patch | 0 .../gtk-3.22.30_configure.ac.patch | 0 .../gtk-3.22.30_configure.patch | 0 .../gtk-3.22.30_demos_Makefile.in.patch | 0 ...tk-3.22.30_demos_gtk-demo_Makefile.am.patch | 0 ...tk-3.22.30_demos_gtk-demo_Makefile.in.patch | 0 ....22.30_demos_icon-browser_Makefile.in.patch | 0 ...2.30_demos_widget-factory_Makefile.am.patch | 0 ...2.30_demos_widget-factory_Makefile.in.patch | 0 ...demos_widget-factory_widget-factory.c.patch | 0 .../gtk-3.22.30_docs_Makefile.in.patch | 0 ...tk-3.22.30_docs_reference_Makefile.in.patch | 0 ....22.30_docs_reference_gdk_Makefile.in.patch | 0 ....22.30_docs_reference_gtk_Makefile.in.patch | 0 ...cs_reference_libgail-util_Makefile.in.patch | 0 .../gtk-3.22.30_docs_tools_Makefile.in.patch | 0 .../gtk-3.22.30_examples_Makefile.in.patch | 0 ...30_examples_application10_Makefile.in.patch | 0 ....30_examples_application1_Makefile.in.patch | 0 ....30_examples_application2_Makefile.in.patch | 0 ....30_examples_application3_Makefile.in.patch | 0 ....30_examples_application4_Makefile.in.patch | 0 ....30_examples_application5_Makefile.in.patch | 0 ....30_examples_application6_Makefile.in.patch | 0 ....30_examples_application7_Makefile.in.patch | 0 ....30_examples_application8_Makefile.in.patch | 0 ....30_examples_application9_Makefile.in.patch | 0 .../gtk-3.22.30_examples_bp_Makefile.in.patch | 0 .../gtk-3.22.30_examples_sunny.c.patch | 0 .../gtk-3.22.30_gdk_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_broadway_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_mir_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_quartz_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_wayland_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_win32_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_win32_rc_Makefile.in.patch | 0 .../gtk-3.22.30_gdk_x11_Makefile.in.patch | 0 .../gtk-3.22.30_gtk-doc.make.patch | 0 .../gtk-3.22.30_gtk_Makefile.in.patch | 0 ...k-3.22.30_gtk_a11y_gtkaccessibility.c.patch | 0 .../gtk-3.22.30_libgail-util_Makefile.in.patch | 0 .../gtk-3.22.30_m4_codeset.m4.patch | 0 .../gtk-3.22.30_m4_extern-inline.m4.patch | 0 .../gtk-3.22.30_m4_fcntl-o.m4.patch | 0 .../gtk-3.22.30_m4_gettext.m4.patch | 0 .../gtk-3.22.30_m4_glibc2.m4.patch | 0 .../gtk-3.22.30_m4_glibc21.m4.patch | 0 .../gtk-3.22.30_m4_gtk-doc.m4.patch | 0 .../gtk-3.22.30_m4_iconv.m4.patch | 0 .../gtk-3.22.30_m4_intdiv0.m4.patch | 0 .../gtk-3.22.30_m4_intl.m4.patch | 0 .../gtk-3.22.30_m4_intldir.m4.patch | 0 .../gtk-3.22.30_m4_intlmacosx.m4.patch | 0 .../gtk-3.22.30_m4_intmax.m4.patch | 0 .../gtk-3.22.30_m4_introspection.m4.patch | 0 .../gtk-3.22.30_m4_inttypes-pri.m4.patch | 0 .../gtk-3.22.30_m4_inttypes_h.m4.patch | 0 .../gtk-3.22.30_m4_lcmessage.m4.patch | 0 .../gtk-3.22.30_m4_lib-ld.m4.patch | 0 .../gtk-3.22.30_m4_lib-link.m4.patch | 0 .../gtk-3.22.30_m4_lib-prefix.m4.patch | 0 .../gtk-3.22.30_m4_libtool.m4.patch | 0 .../gtk-3.22.30_m4_lock.m4.patch | 0 .../gtk-3.22.30_m4_longlong.m4.patch | 0 .../gtk-3.22.30_m4_ltoptions.m4.patch | 0 .../gtk-3.22.30_m4_ltsugar.m4.patch | 0 .../gtk-3.22.30_m4_ltversion.m4.patch | 0 .../gtk-3.22.30_m4_lt~obsolete.m4.patch | 0 .../gtk-3.22.30_m4_nls.m4.patch | 0 .../gtk-3.22.30_m4_po.m4.patch | 0 .../gtk-3.22.30_m4_printf-posix.m4.patch | 0 .../gtk-3.22.30_m4_progtest.m4.patch | 0 .../gtk-3.22.30_m4_size_max.m4.patch | 0 .../gtk-3.22.30_m4_stdint_h.m4.patch | 0 .../gtk-3.22.30_m4_threadlib.m4.patch | 0 .../gtk-3.22.30_m4_uintmax_t.m4.patch | 0 .../gtk-3.22.30_m4_visibility.m4.patch | 0 .../gtk-3.22.30_m4_wchar_t.m4.patch | 0 .../gtk-3.22.30_m4_wint_t.m4.patch | 0 .../gtk-3.22.30_m4_xsize.m4.patch | 0 .../gtk-3.22.30_m4macros_Makefile.in.patch | 0 .../gtk-3.22.30_modules_Makefile.in.patch | 0 ...gtk-3.22.30_modules_input_Makefile.in.patch | 0 ....30_modules_printbackends_Makefile.in.patch | 0 ..._printbackends_cloudprint_Makefile.in.patch | 0 ...odules_printbackends_cups_Makefile.in.patch | 0 ...ntbackends_cups_gtkprintbackendcups.c.patch | 0 ...odules_printbackends_file_Makefile.in.patch | 0 ...modules_printbackends_lpr_Makefile.in.patch | 0 ...odules_printbackends_papi_Makefile.in.patch | 0 ...odules_printbackends_test_Makefile.in.patch | 0 ...-3.22.30_po-properties_Makefile.in.in.patch | 0 ...22.30_po-properties_Makevars.template.patch | 0 .../gtk-3.22.30_po-properties_Rules-quot.patch | 0 ...tk-3.22.30_po-properties_boldquot.sed.patch | 0 ...2.30_po-properties_en@boldquot.header.patch | 0 ...-3.22.30_po-properties_en@quot.header.patch | 0 ...22.30_po-properties_insert-header.sin.patch | 0 .../gtk-3.22.30_po-properties_quot.sed.patch | 0 ....30_po-properties_remove-potcdate.sin.patch | 0 .../gtk-3.22.30_po_Makefile.in.in.patch | 0 .../gtk-3.22.30_po_Makevars.template.patch | 0 .../gtk-3.22.30_po_Rules-quot.patch | 0 .../gtk-3.22.30_po_boldquot.sed.patch | 0 .../gtk-3.22.30_po_en@boldquot.header.patch | 0 .../gtk-3.22.30_po_en@quot.header.patch | 0 .../gtk-3.22.30_po_insert-header.sin.patch | 0 .../gtk-3.22.30_po_quot.sed.patch | 0 .../gtk-3.22.30_po_remove-potcdate.sin.patch | 0 .../gtk-3.22.30_tests_Makefile.in.patch | 0 .../gtk-3.22.30_tests_testappchooser.c.patch | 0 ...gtk-3.22.30_tests_visuals_Makefile.in.patch | 0 .../gtk-3.22.30_testsuite_Makefile.in.patch | 0 ...tk-3.22.30_testsuite_a11y_Makefile.in.patch | 0 ...2.30_testsuite_a11y_state_Makefile.in.patch | 0 ...gtk-3.22.30_testsuite_css_Makefile.in.patch | 0 ...22.30_testsuite_css_nodes_Makefile.in.patch | 0 ...2.30_testsuite_css_parser_Makefile.in.patch | 0 ...22.30_testsuite_css_style_Makefile.in.patch | 0 ...gtk-3.22.30_testsuite_gdk_Makefile.in.patch | 0 ...gtk-3.22.30_testsuite_gtk_Makefile.in.patch | 0 ....22.30_testsuite_reftests_Makefile.in.patch | 0 ...k-3.22.30_testsuite_tools_Makefile.in.patch | 0 .../gtk-update-icon-cache.subpackage.sh | 0 x11-packages/{libgtk3 => gtk3}/postinst | 0 x11-packages/{libgtk3 => gtk3}/postrm | 0 x11-packages/{libgtk3 => gtk3}/triggers | 0 x11-packages/libepoxy/build.sh | 4 ++-- x11-packages/{libmesa => mesa}/build.sh | 4 +++- x11-packages/mtpaint/build.sh | 4 ++-- x11-packages/qemu-system-x86_64/build.sh | 4 ++-- .../qemu-system-aarch64.subpackage.sh | 2 +- .../qemu-system-arm.subpackage.sh | 2 +- .../qemu-system-i386.subpackage.sh | 2 +- .../{riscvemu-sdl => riscvemu}/build.sh | 11 ++++------- .../{riscvemu-sdl => riscvemu}/postinst | 0 x11-packages/{libsdl-net => sdl-net}/build.sh | 7 +++++-- ...1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch | 0 ..._src_joystick_linux_SDL_sysjoystick.c.patch | 0 .../SDL-1.2.15_src_video_SDL_gamma.c.patch | 0 .../SDL-1.2.15_src_video_SDL_yuv_sw.c.patch | 0 ...-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch | 0 ...1.2.15_src_video_ipod_SDL_ipodvideo.c.patch | 0 ...L-1.2.15_src_video_photon_SDL_ph_gl.h.patch | 0 ...-1.2.15_src_video_x11_SDL_x11events.c.patch | 0 ....2.15_src_video_x11_SDL_x11events_c.h.patch | 0 .../SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch | 0 ...L-1.2.15_src_video_x11_SDL_x11modes.c.patch | 0 ...SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch | 0 ...L-1.2.15_src_video_x11_SDL_x11video.c.patch | 0 .../SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch | 0 x11-packages/{libsdl => sdl}/build.sh | 13 +++++++++++-- .../SDL2-2.0.8_configure.patch | 0 .../SDL2-2.0.8_include_SDL_config.h.patch | 0 .../SDL2-2.0.8_include_SDL_egl.h.patch | 0 .../SDL2-2.0.8_include_SDL_main.h.patch | 0 .../SDL2-2.0.8_include_SDL_platform.h.patch | 0 .../SDL2-2.0.8_include_SDL_rwops.h.patch | 0 .../SDL2-2.0.8_include_SDL_stdinc.h.patch | 0 .../SDL2-2.0.8_include_SDL_system.h.patch | 0 .../SDL2-2.0.8_src_SDL.c.patch | 0 .../SDL2-2.0.8_src_SDL_log.c.patch | 0 .../SDL2-2.0.8_src_atomic_SDL_atomic.c.patch | 0 .../SDL2-2.0.8_src_dynapi_SDL_dynapi.c.patch | 0 ...2-2.0.8_src_dynapi_SDL_dynapi_procs.h.patch | 0 .../SDL2-2.0.8_src_file_SDL_rwops.c.patch | 0 ...0.8_src_joystick_SDL_gamecontroller.c.patch | 0 ...8_src_joystick_SDL_gamecontrollerdb.h.patch | 0 ...-2.0.8_src_joystick_SDL_sysjoystick.h.patch | 0 .../SDL2-2.0.8_src_stdlib_SDL_getenv.c.patch | 0 ....8_src_thread_pthread_SDL_systhread.c.patch | 0 .../SDL2-2.0.8_src_video_SDL_video.c.patch | 0 ...8_src_video_khronos_KHR_khrplatform.h.patch | 0 ...rc_video_khronos_vulkan_vk_platform.h.patch | 0 x11-packages/{libsdl2 => sdl2}/build.sh | 5 ++++- x11-packages/the-powder-toy/build.sh | 4 ++-- x11-packages/tigervnc/build.sh | 10 +++++----- x11-packages/wireshark-gtk/build.sh | 4 ++-- x11-packages/xarchiver/build.sh | 4 ++-- x11-packages/xcbproto/build.sh | 9 --------- .../{xorg-xvfb => xorg-server-xvfb}/build.sh | 10 +++++----- ...r-1.20.1_hw_xfree86_common_compiler.h.patch | 0 ...1.20.1_hw_xfree86_common_xf86Config.c.patch | 0 ...w_xfree86_os-support_linux_lnx_acpi.c.patch | 0 ...w_xfree86_os-support_linux_lnx_kmod.c.patch | 0 ...erver-1.20.1_hw_xfree86_parser_scan.c.patch | 0 ...rver-1.20.1_hw_xfree86_parser_write.c.patch | 0 ...rver-1.20.1_hw_xfree86_xorg-wrapper.c.patch | 0 ...hw_xquartz_mach-startup_bundle-main.c.patch | 0 ...rg-server-1.20.1_hw_xwin_InitOutput.c.patch | 0 .../xorg-server-1.20.1_include_site.h.patch | 0 .../xorg-server-1.20.1_os_access.c.patch | 0 .../xorg-server-1.20.1_os_backtrace.c.patch | 0 .../xorg-server-1.20.1_os_connection.c.patch | 0 .../xorg-server-1.20.1_os_osinit.c.patch | 0 .../xorg-server-1.20.1_os_utils.c.patch | 0 .../xorg-server-1.20.1_xkb_ddxLoad.c.patch | 0 244 files changed, 98 insertions(+), 66 deletions(-) rename x11-packages/{libatk => atk}/build.sh (61%) rename x11-packages/{libglu => glu}/build.sh (70%) rename x11-packages/{libgtk2 => gtk2}/build.sh (73%) rename x11-packages/{libgtk2 => gtk2}/gtk-2.24.32_demos_testpixbuf-color.c.patch (100%) rename x11-packages/{libgtk2 => gtk2}/gtk-2.24.32_docs_tools_widgets.c.patch (100%) rename x11-packages/{libgtk2 => gtk2}/gtk-2.24.32_gtk_gtkfilesel.c.patch (100%) rename x11-packages/{libgtk2 => gtk2}/gtk-2.24.32_gtk_tests_filechooser.c.patch (100%) rename x11-packages/{libgtk2 => gtk2}/gtk-2.24.32_modules_printbackends_cups_gtkprintbackendcups.c.patch (100%) rename x11-packages/{libgtk2 => gtk2}/gtk-2.24.32_tests_testfilechooser.c.patch (100%) rename x11-packages/{libgtk2 => gtk2}/postinst (100%) rename x11-packages/{libgtk2 => gtk2}/postrm (100%) rename x11-packages/{libgtk2 => gtk2}/triggers (100%) rename x11-packages/{libgtk2 => gtk2}/xid-collision-debug.patch (100%) rename x11-packages/{libgtk3 => gtk3}/build.sh (64%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_ABOUT-NLS.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_INSTALL.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_aclocal.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_output.0.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_output.1.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_output.2.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_output.3.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_requests.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_traces.0.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_traces.1.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_traces.2.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_autom4te.cache_traces.3.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_compile.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_config.guess.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_config.rpath.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_config.sub.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_depcomp.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_install-sh.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_ltmain.sh.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build-aux_missing.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_vs10_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_vs11_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_vs12_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_vs14_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_vs15_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_build_win32_vs9_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_config.h.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_configure.ac.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_configure.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_gtk-demo_Makefile.am.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_gtk-demo_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_icon-browser_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_widget-factory_Makefile.am.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_widget-factory_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_demos_widget-factory_widget-factory.c.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_docs_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_docs_reference_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_docs_reference_gdk_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_docs_reference_gtk_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_docs_reference_libgail-util_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_docs_tools_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application10_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application1_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application2_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application3_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application4_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application5_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application6_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application7_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application8_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_application9_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_bp_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_examples_sunny.c.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_broadway_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_mir_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_quartz_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_wayland_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_win32_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_win32_rc_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gdk_x11_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gtk-doc.make.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gtk_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_gtk_a11y_gtkaccessibility.c.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_libgail-util_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_codeset.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_extern-inline.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_fcntl-o.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_gettext.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_glibc2.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_glibc21.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_gtk-doc.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_iconv.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_intdiv0.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_intl.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_intldir.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_intlmacosx.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_intmax.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_introspection.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_inttypes-pri.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_inttypes_h.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_lcmessage.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_lib-ld.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_lib-link.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_lib-prefix.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_libtool.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_lock.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_longlong.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_ltoptions.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_ltsugar.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_ltversion.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_lt~obsolete.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_nls.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_po.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_printf-posix.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_progtest.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_size_max.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_stdint_h.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_threadlib.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_uintmax_t.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_visibility.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_wchar_t.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_wint_t.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4_xsize.m4.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_m4macros_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_input_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_cloudprint_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_cups_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_cups_gtkprintbackendcups.c.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_file_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_lpr_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_papi_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_modules_printbackends_test_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_Makefile.in.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_Makevars.template.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_Rules-quot.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_boldquot.sed.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_en@boldquot.header.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_en@quot.header.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_insert-header.sin.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_quot.sed.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po-properties_remove-potcdate.sin.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_Makefile.in.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_Makevars.template.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_Rules-quot.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_boldquot.sed.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_en@boldquot.header.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_en@quot.header.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_insert-header.sin.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_quot.sed.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_po_remove-potcdate.sin.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_tests_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_tests_testappchooser.c.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_tests_visuals_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_a11y_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_a11y_state_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_css_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_css_nodes_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_css_parser_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_css_style_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_gdk_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_gtk_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_reftests_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-3.22.30_testsuite_tools_Makefile.in.patch (100%) rename x11-packages/{libgtk3 => gtk3}/gtk-update-icon-cache.subpackage.sh (100%) rename x11-packages/{libgtk3 => gtk3}/postinst (100%) rename x11-packages/{libgtk3 => gtk3}/postrm (100%) rename x11-packages/{libgtk3 => gtk3}/triggers (100%) rename x11-packages/{libmesa => mesa}/build.sh (93%) rename x11-packages/{riscvemu-sdl => riscvemu}/build.sh (81%) rename x11-packages/{riscvemu-sdl => riscvemu}/postinst (100%) rename x11-packages/{libsdl-net => sdl-net}/build.sh (76%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_SDL_gamma.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch (100%) rename x11-packages/{libsdl => sdl}/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch (100%) rename x11-packages/{libsdl => sdl}/build.sh (72%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_configure.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_config.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_egl.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_main.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_platform.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_rwops.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_stdinc.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_include_SDL_system.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_SDL.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_SDL_log.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_atomic_SDL_atomic.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_dynapi_SDL_dynapi.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_dynapi_SDL_dynapi_procs.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_file_SDL_rwops.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_joystick_SDL_gamecontroller.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_joystick_SDL_gamecontrollerdb.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_joystick_SDL_sysjoystick.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_stdlib_SDL_getenv.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_thread_pthread_SDL_systhread.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_video_SDL_video.c.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_video_khronos_KHR_khrplatform.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/SDL2-2.0.8_src_video_khronos_vulkan_vk_platform.h.patch (100%) rename x11-packages/{libsdl2 => sdl2}/build.sh (94%) delete mode 100644 x11-packages/xcbproto/build.sh rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/build.sh (86%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_include_site.h.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_os_access.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_os_backtrace.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_os_connection.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_os_osinit.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_os_utils.c.patch (100%) rename x11-packages/{xorg-xvfb => xorg-server-xvfb}/xorg-server-1.20.1_xkb_ddxLoad.c.patch (100%) diff --git a/x11-packages/libatk/build.sh b/x11-packages/atk/build.sh similarity index 61% rename from x11-packages/libatk/build.sh rename to x11-packages/atk/build.sh index e758bb6ef..6b88edbea 100644 --- a/x11-packages/libatk/build.sh +++ b/x11-packages/atk/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.gtk.org TERMUX_PKG_DESCRIPTION="The interface definitions of accessibility infrastructure" -_major=2.30 -_minor=0 -TERMUX_PKG_VERSION=${_major}.${_minor} -TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/atk/${_major}/atk-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_VERSION=2.30.0 +TERMUX_PKG_REVISION=1 +TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/atk/2.30/atk-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b + TERMUX_PKG_DEPENDS="glib, libandroid-support" +TERMUX_PKG_CONFLICTS="libatk" +TERMUX_PKG_REPLACES="libatk" diff --git a/x11-packages/dosbox/build.sh b/x11-packages/dosbox/build.sh index d8dd23064..5c2a510fc 100644 --- a/x11-packages/dosbox/build.sh +++ b/x11-packages/dosbox/build.sh @@ -3,7 +3,13 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://dosbox.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Emulator with builtin DOS for running DOS Games" TERMUX_PKG_VERSION=0.74.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/dosbox/dosbox-${TERMUX_PKG_VERSION/.2/-2}.tar.gz TERMUX_PKG_SHA256=7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf -TERMUX_PKG_DEPENDS="libc++, libsdl, libsdl-net" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-dynamic-x86 --disable-fpu-x86 --disable-opengl" +TERMUX_PKG_DEPENDS="libc++, sdl, sdl-net" + +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--disable-dynamic-x86 +--disable-fpu-x86 +--disable-opengl +" diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh index 3469e3268..ea75a04f8 100644 --- a/x11-packages/emacs-x/build.sh +++ b/x11-packages/emacs-x/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more (with X11 support)" TERMUX_PKG_VERSION=26.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c -TERMUX_PKG_DEPENDS="giflib, libandroid-shmem, libgnutls, libgtk3, libjpeg-turbo, libpng, librsvg, libtiff, libxml2, libxpm, littlecms, ncurses" +TERMUX_PKG_DEPENDS="giflib, gtk3, libandroid-shmem, libgnutls, libjpeg-turbo, libpng, librsvg, libtiff, libxml2, libxpm, littlecms, ncurses" TERMUX_PKG_CONFLICTS="emacs" TERMUX_PKG_REPLACES="emacs" TERMUX_PKG_PROVIDES="emacs" diff --git a/x11-packages/galculator/build.sh b/x11-packages/galculator/build.sh index df59d799d..bfe278e49 100644 --- a/x11-packages/galculator/build.sh +++ b/x11-packages/galculator/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://galculator.sourceforge.net/ TERMUX_PKG_DESCRIPTION="GTK+ based scientific calculator" TERMUX_PKG_VERSION=2.1.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://galculator.mnim.org/downloads/galculator-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=01cfafe6606e7ec45facb708ef85efd6c1e8bb41001a999d28212a825ef778ae -TERMUX_PKG_DEPENDS="libgtk3" +TERMUX_PKG_DEPENDS="gtk3" termux_step_pre_configure() { export LIBS="-landroid-shmem" diff --git a/x11-packages/geany/build.sh b/x11-packages/geany/build.sh index 7761c3645..a9c1ff86e 100644 --- a/x11-packages/geany/build.sh +++ b/x11-packages/geany/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.geany.org/ TERMUX_PKG_DESCRIPTION="Fast and lightweight IDE" TERMUX_PKG_VERSION=1.33.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://download.geany.org/geany-${TERMUX_PKG_VERSION/.0}.tar.bz2 TERMUX_PKG_SHA256=66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2 -TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libgtk3" +TERMUX_PKG_DEPENDS="gtk3, libandroid-glob, libc++" TERMUX_PKG_RECOMMENDS="clang, make" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gtk3" TERMUX_PKG_RM_AFTER_INSTALL="share/icons/hicolor/icon-theme.cache" diff --git a/x11-packages/libglu/build.sh b/x11-packages/glu/build.sh similarity index 70% rename from x11-packages/libglu/build.sh rename to x11-packages/glu/build.sh index 51b910355..a43896e78 100644 --- a/x11-packages/libglu/build.sh +++ b/x11-packages/glu/build.sh @@ -3,6 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://cgit.freedesktop.org/mesa/glu/ TERMUX_PKG_DESCRIPTION="Mesa OpenGL Utility library" TERMUX_PKG_VERSION=9.0.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12 -TERMUX_PKG_DEPENDS="libandroid-shmem, libandroid-support, libc++, libdrm, libexpat, libmesa, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxfixes, libxshmfence" + +TERMUX_PKG_DEPENDS="libandroid-shmem, libandroid-support, libc++, libdrm, libexpat, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxfixes, libxshmfence, mesa" +TERMUX_PKG_CONFLICTS="libglu" +TERMUX_PKG_REPLACES="libglu" diff --git a/x11-packages/libgtk2/build.sh b/x11-packages/gtk2/build.sh similarity index 73% rename from x11-packages/libgtk2/build.sh rename to x11-packages/gtk2/build.sh index e2164fffb..9f07ea717 100644 --- a/x11-packages/libgtk2/build.sh +++ b/x11-packages/gtk2/build.sh @@ -3,12 +3,15 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://www.gtk.org/ TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit (legacy)" TERMUX_PKG_VERSION=2.24.32 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/GNOME/gtk/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=961678c64ad986029befd7bdd8ed3e3849e2c5e54d24affbc7d49758245c87fa -TERMUX_PKG_DEPENDS="adwaita-icon-theme, coreutils, desktop-file-utils, glib-bin, gtk-update-icon-cache, libatk, libcairo-x, librsvg, libxcomposite, libxcursor, libxdamage, libxi, libxinerama, libxrandr, pango-x, shared-mime-info" TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, glib-bin, gtk-update-icon-cache, libcairo-x, librsvg, libxcomposite, libxcursor, libxdamage, libxi, libxinerama, libxrandr, pango-x, shared-mime-info" +TERMUX_PKG_CONFLICTS="libgtk2" +TERMUX_PKG_REPLACES="libgtk2" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-shm --enable-xkb @@ -19,7 +22,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-introspection=no " -## 1. gtk-update-icon-cache is subpackage of libgtk3 +## 1. gtk-update-icon-cache is subpackage of 'gtk3' ## 2. locales are not supported by Termux and wasting space TERMUX_PKG_RM_AFTER_INSTALL=" bin/gtk-update-icon-cache diff --git a/x11-packages/libgtk2/gtk-2.24.32_demos_testpixbuf-color.c.patch b/x11-packages/gtk2/gtk-2.24.32_demos_testpixbuf-color.c.patch similarity index 100% rename from x11-packages/libgtk2/gtk-2.24.32_demos_testpixbuf-color.c.patch rename to x11-packages/gtk2/gtk-2.24.32_demos_testpixbuf-color.c.patch diff --git a/x11-packages/libgtk2/gtk-2.24.32_docs_tools_widgets.c.patch b/x11-packages/gtk2/gtk-2.24.32_docs_tools_widgets.c.patch similarity index 100% rename from x11-packages/libgtk2/gtk-2.24.32_docs_tools_widgets.c.patch rename to x11-packages/gtk2/gtk-2.24.32_docs_tools_widgets.c.patch diff --git a/x11-packages/libgtk2/gtk-2.24.32_gtk_gtkfilesel.c.patch b/x11-packages/gtk2/gtk-2.24.32_gtk_gtkfilesel.c.patch similarity index 100% rename from x11-packages/libgtk2/gtk-2.24.32_gtk_gtkfilesel.c.patch rename to x11-packages/gtk2/gtk-2.24.32_gtk_gtkfilesel.c.patch diff --git a/x11-packages/libgtk2/gtk-2.24.32_gtk_tests_filechooser.c.patch b/x11-packages/gtk2/gtk-2.24.32_gtk_tests_filechooser.c.patch similarity index 100% rename from x11-packages/libgtk2/gtk-2.24.32_gtk_tests_filechooser.c.patch rename to x11-packages/gtk2/gtk-2.24.32_gtk_tests_filechooser.c.patch diff --git a/x11-packages/libgtk2/gtk-2.24.32_modules_printbackends_cups_gtkprintbackendcups.c.patch b/x11-packages/gtk2/gtk-2.24.32_modules_printbackends_cups_gtkprintbackendcups.c.patch similarity index 100% rename from x11-packages/libgtk2/gtk-2.24.32_modules_printbackends_cups_gtkprintbackendcups.c.patch rename to x11-packages/gtk2/gtk-2.24.32_modules_printbackends_cups_gtkprintbackendcups.c.patch diff --git a/x11-packages/libgtk2/gtk-2.24.32_tests_testfilechooser.c.patch b/x11-packages/gtk2/gtk-2.24.32_tests_testfilechooser.c.patch similarity index 100% rename from x11-packages/libgtk2/gtk-2.24.32_tests_testfilechooser.c.patch rename to x11-packages/gtk2/gtk-2.24.32_tests_testfilechooser.c.patch diff --git a/x11-packages/libgtk2/postinst b/x11-packages/gtk2/postinst similarity index 100% rename from x11-packages/libgtk2/postinst rename to x11-packages/gtk2/postinst diff --git a/x11-packages/libgtk2/postrm b/x11-packages/gtk2/postrm similarity index 100% rename from x11-packages/libgtk2/postrm rename to x11-packages/gtk2/postrm diff --git a/x11-packages/libgtk2/triggers b/x11-packages/gtk2/triggers similarity index 100% rename from x11-packages/libgtk2/triggers rename to x11-packages/gtk2/triggers diff --git a/x11-packages/libgtk2/xid-collision-debug.patch b/x11-packages/gtk2/xid-collision-debug.patch similarity index 100% rename from x11-packages/libgtk2/xid-collision-debug.patch rename to x11-packages/gtk2/xid-collision-debug.patch diff --git a/x11-packages/libgtk3/build.sh b/x11-packages/gtk3/build.sh similarity index 64% rename from x11-packages/libgtk3/build.sh rename to x11-packages/gtk3/build.sh index 4cde798a3..7e3ce3a26 100644 --- a/x11-packages/libgtk3/build.sh +++ b/x11-packages/gtk3/build.sh @@ -3,13 +3,25 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://www.gtk.org/ TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit" TERMUX_PKG_VERSION=3.24.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/GNOME/gtk/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=3dd9a8d52e6832e9294182c3a9d3b3979e9593db181101476323241ae67b4a44 -TERMUX_PKG_DEPENDS="adwaita-icon-theme, coreutils, desktop-file-utils, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, libatk, libcairo-x, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango-x, shared-mime-info" +TERMUX_PKG_BUILD_IN_SRC=true + +TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, libcairo-x, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango-x, shared-mime-info" TERMUX_PKG_BUILD_DEPENDS="xorgproto" TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto" -TERMUX_PKG_BUILD_IN_SRC=true -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --enable-xinerama --enable-xfixes --enable-xcomposite --enable-xdamage" +TERMUX_PKG_CONFLICTS="libgtk3" +TERMUX_PKG_REPLACES="libgtk3" + +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--disable-introspection +--enable-xinerama +--enable-xfixes +--enable-xcomposite +--enable-xdamage +" + TERMUX_PKG_RM_AFTER_INSTALL="share/glib-2.0/schemas/gschemas.compiled" termux_step_pre_configure() { diff --git a/x11-packages/libgtk3/gtk-3.22.30_ABOUT-NLS.patch b/x11-packages/gtk3/gtk-3.22.30_ABOUT-NLS.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_ABOUT-NLS.patch rename to x11-packages/gtk3/gtk-3.22.30_ABOUT-NLS.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_INSTALL.patch b/x11-packages/gtk3/gtk-3.22.30_INSTALL.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_INSTALL.patch rename to x11-packages/gtk3/gtk-3.22.30_INSTALL.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_aclocal.m4.patch b/x11-packages/gtk3/gtk-3.22.30_aclocal.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_aclocal.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_aclocal.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.0.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.0.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.0.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.0.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.1.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.1.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.1.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.1.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.2.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.2.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.2.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.2.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.3.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.3.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_output.3.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_output.3.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_requests.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_requests.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_requests.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_requests.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.0.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.0.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.0.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.0.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.1.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.1.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.1.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.1.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.2.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.2.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.2.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.2.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.3.patch b/x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.3.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_autom4te.cache_traces.3.patch rename to x11-packages/gtk3/gtk-3.22.30_autom4te.cache_traces.3.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_compile.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_compile.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_compile.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_compile.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_config.guess.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_config.guess.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_config.guess.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_config.guess.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_config.rpath.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_config.rpath.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_config.rpath.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_config.rpath.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_config.sub.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_config.sub.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_config.sub.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_config.sub.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_depcomp.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_depcomp.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_depcomp.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_depcomp.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_install-sh.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_install-sh.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_install-sh.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_install-sh.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_ltmain.sh.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_ltmain.sh.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_ltmain.sh.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_ltmain.sh.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build-aux_missing.patch b/x11-packages/gtk3/gtk-3.22.30_build-aux_missing.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build-aux_missing.patch rename to x11-packages/gtk3/gtk-3.22.30_build-aux_missing.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_vs10_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_vs10_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_vs10_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_vs10_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_vs11_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_vs11_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_vs11_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_vs11_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_vs12_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_vs12_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_vs12_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_vs12_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_vs14_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_vs14_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_vs14_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_vs14_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_vs15_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_vs15_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_vs15_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_vs15_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_build_win32_vs9_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_build_win32_vs9_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_build_win32_vs9_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_build_win32_vs9_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_config.h.in.patch b/x11-packages/gtk3/gtk-3.22.30_config.h.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_config.h.in.patch rename to x11-packages/gtk3/gtk-3.22.30_config.h.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_configure.ac.patch b/x11-packages/gtk3/gtk-3.22.30_configure.ac.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_configure.ac.patch rename to x11-packages/gtk3/gtk-3.22.30_configure.ac.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_configure.patch b/x11-packages/gtk3/gtk-3.22.30_configure.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_configure.patch rename to x11-packages/gtk3/gtk-3.22.30_configure.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_demos_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_gtk-demo_Makefile.am.patch b/x11-packages/gtk3/gtk-3.22.30_demos_gtk-demo_Makefile.am.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_gtk-demo_Makefile.am.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_gtk-demo_Makefile.am.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_gtk-demo_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_demos_gtk-demo_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_gtk-demo_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_gtk-demo_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_icon-browser_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_demos_icon-browser_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_icon-browser_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_icon-browser_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_widget-factory_Makefile.am.patch b/x11-packages/gtk3/gtk-3.22.30_demos_widget-factory_Makefile.am.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_widget-factory_Makefile.am.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_widget-factory_Makefile.am.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_widget-factory_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_demos_widget-factory_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_widget-factory_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_widget-factory_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_demos_widget-factory_widget-factory.c.patch b/x11-packages/gtk3/gtk-3.22.30_demos_widget-factory_widget-factory.c.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_demos_widget-factory_widget-factory.c.patch rename to x11-packages/gtk3/gtk-3.22.30_demos_widget-factory_widget-factory.c.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_docs_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_docs_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_docs_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_docs_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_docs_reference_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_docs_reference_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_docs_reference_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_docs_reference_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_docs_reference_gdk_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_docs_reference_gdk_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_docs_reference_gdk_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_docs_reference_gdk_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_docs_reference_gtk_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_docs_reference_gtk_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_docs_reference_gtk_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_docs_reference_gtk_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_docs_reference_libgail-util_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_docs_reference_libgail-util_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_docs_reference_libgail-util_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_docs_reference_libgail-util_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_docs_tools_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_docs_tools_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_docs_tools_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_docs_tools_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application10_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application10_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application10_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application10_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application1_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application1_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application1_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application1_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application2_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application2_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application2_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application2_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application3_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application3_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application3_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application3_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application4_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application4_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application4_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application4_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application5_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application5_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application5_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application5_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application6_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application6_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application6_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application6_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application7_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application7_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application7_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application7_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application8_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application8_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application8_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application8_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_application9_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_application9_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_application9_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_application9_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_bp_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_examples_bp_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_bp_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_bp_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_examples_sunny.c.patch b/x11-packages/gtk3/gtk-3.22.30_examples_sunny.c.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_examples_sunny.c.patch rename to x11-packages/gtk3/gtk-3.22.30_examples_sunny.c.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_broadway_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_broadway_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_broadway_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_broadway_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_mir_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_mir_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_mir_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_mir_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_quartz_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_quartz_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_quartz_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_quartz_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_wayland_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_wayland_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_wayland_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_wayland_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_win32_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_win32_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_win32_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_win32_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_win32_rc_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_win32_rc_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_win32_rc_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_win32_rc_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gdk_x11_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gdk_x11_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gdk_x11_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gdk_x11_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gtk-doc.make.patch b/x11-packages/gtk3/gtk-3.22.30_gtk-doc.make.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gtk-doc.make.patch rename to x11-packages/gtk3/gtk-3.22.30_gtk-doc.make.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gtk_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_gtk_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gtk_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_gtk_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_gtk_a11y_gtkaccessibility.c.patch b/x11-packages/gtk3/gtk-3.22.30_gtk_a11y_gtkaccessibility.c.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_gtk_a11y_gtkaccessibility.c.patch rename to x11-packages/gtk3/gtk-3.22.30_gtk_a11y_gtkaccessibility.c.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_libgail-util_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_libgail-util_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_libgail-util_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_libgail-util_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_codeset.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_codeset.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_codeset.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_codeset.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_extern-inline.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_extern-inline.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_extern-inline.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_extern-inline.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_fcntl-o.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_fcntl-o.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_fcntl-o.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_fcntl-o.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_gettext.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_gettext.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_gettext.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_gettext.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_glibc2.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_glibc2.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_glibc2.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_glibc2.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_glibc21.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_glibc21.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_glibc21.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_glibc21.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_gtk-doc.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_gtk-doc.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_gtk-doc.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_gtk-doc.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_iconv.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_iconv.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_iconv.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_iconv.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_intdiv0.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_intdiv0.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_intdiv0.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_intdiv0.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_intl.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_intl.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_intl.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_intl.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_intldir.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_intldir.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_intldir.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_intldir.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_intlmacosx.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_intlmacosx.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_intlmacosx.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_intlmacosx.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_intmax.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_intmax.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_intmax.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_intmax.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_introspection.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_introspection.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_introspection.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_introspection.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_inttypes-pri.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_inttypes-pri.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_inttypes-pri.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_inttypes-pri.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_inttypes_h.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_inttypes_h.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_inttypes_h.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_inttypes_h.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_lcmessage.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_lcmessage.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_lcmessage.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_lcmessage.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_lib-ld.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_lib-ld.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_lib-ld.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_lib-ld.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_lib-link.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_lib-link.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_lib-link.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_lib-link.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_lib-prefix.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_lib-prefix.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_lib-prefix.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_lib-prefix.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_libtool.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_libtool.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_libtool.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_libtool.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_lock.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_lock.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_lock.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_lock.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_longlong.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_longlong.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_longlong.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_longlong.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_ltoptions.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_ltoptions.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_ltoptions.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_ltoptions.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_ltsugar.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_ltsugar.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_ltsugar.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_ltsugar.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_ltversion.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_ltversion.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_ltversion.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_ltversion.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_lt~obsolete.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_lt~obsolete.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_lt~obsolete.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_lt~obsolete.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_nls.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_nls.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_nls.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_nls.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_po.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_po.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_po.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_po.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_printf-posix.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_printf-posix.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_printf-posix.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_printf-posix.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_progtest.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_progtest.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_progtest.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_progtest.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_size_max.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_size_max.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_size_max.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_size_max.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_stdint_h.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_stdint_h.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_stdint_h.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_stdint_h.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_threadlib.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_threadlib.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_threadlib.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_threadlib.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_uintmax_t.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_uintmax_t.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_uintmax_t.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_uintmax_t.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_visibility.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_visibility.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_visibility.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_visibility.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_wchar_t.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_wchar_t.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_wchar_t.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_wchar_t.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_wint_t.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_wint_t.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_wint_t.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_wint_t.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4_xsize.m4.patch b/x11-packages/gtk3/gtk-3.22.30_m4_xsize.m4.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4_xsize.m4.patch rename to x11-packages/gtk3/gtk-3.22.30_m4_xsize.m4.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_m4macros_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_m4macros_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_m4macros_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_m4macros_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_input_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_input_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_input_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_input_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_cloudprint_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_cloudprint_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_cloudprint_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_cloudprint_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_cups_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_cups_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_cups_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_cups_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_cups_gtkprintbackendcups.c.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_cups_gtkprintbackendcups.c.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_cups_gtkprintbackendcups.c.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_cups_gtkprintbackendcups.c.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_file_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_file_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_file_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_file_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_lpr_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_lpr_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_lpr_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_lpr_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_papi_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_papi_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_papi_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_papi_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_test_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_modules_printbackends_test_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_modules_printbackends_test_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_modules_printbackends_test_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_Makefile.in.in.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_Makefile.in.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_Makefile.in.in.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_Makefile.in.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_Makevars.template.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_Makevars.template.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_Makevars.template.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_Makevars.template.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_Rules-quot.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_Rules-quot.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_Rules-quot.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_Rules-quot.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_boldquot.sed.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_boldquot.sed.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_boldquot.sed.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_boldquot.sed.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_en@boldquot.header.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_en@boldquot.header.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_en@boldquot.header.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_en@boldquot.header.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_en@quot.header.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_en@quot.header.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_en@quot.header.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_en@quot.header.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_insert-header.sin.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_insert-header.sin.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_insert-header.sin.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_insert-header.sin.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_quot.sed.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_quot.sed.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_quot.sed.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_quot.sed.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po-properties_remove-potcdate.sin.patch b/x11-packages/gtk3/gtk-3.22.30_po-properties_remove-potcdate.sin.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po-properties_remove-potcdate.sin.patch rename to x11-packages/gtk3/gtk-3.22.30_po-properties_remove-potcdate.sin.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_Makefile.in.in.patch b/x11-packages/gtk3/gtk-3.22.30_po_Makefile.in.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_Makefile.in.in.patch rename to x11-packages/gtk3/gtk-3.22.30_po_Makefile.in.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_Makevars.template.patch b/x11-packages/gtk3/gtk-3.22.30_po_Makevars.template.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_Makevars.template.patch rename to x11-packages/gtk3/gtk-3.22.30_po_Makevars.template.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_Rules-quot.patch b/x11-packages/gtk3/gtk-3.22.30_po_Rules-quot.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_Rules-quot.patch rename to x11-packages/gtk3/gtk-3.22.30_po_Rules-quot.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_boldquot.sed.patch b/x11-packages/gtk3/gtk-3.22.30_po_boldquot.sed.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_boldquot.sed.patch rename to x11-packages/gtk3/gtk-3.22.30_po_boldquot.sed.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_en@boldquot.header.patch b/x11-packages/gtk3/gtk-3.22.30_po_en@boldquot.header.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_en@boldquot.header.patch rename to x11-packages/gtk3/gtk-3.22.30_po_en@boldquot.header.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_en@quot.header.patch b/x11-packages/gtk3/gtk-3.22.30_po_en@quot.header.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_en@quot.header.patch rename to x11-packages/gtk3/gtk-3.22.30_po_en@quot.header.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_insert-header.sin.patch b/x11-packages/gtk3/gtk-3.22.30_po_insert-header.sin.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_insert-header.sin.patch rename to x11-packages/gtk3/gtk-3.22.30_po_insert-header.sin.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_quot.sed.patch b/x11-packages/gtk3/gtk-3.22.30_po_quot.sed.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_quot.sed.patch rename to x11-packages/gtk3/gtk-3.22.30_po_quot.sed.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_po_remove-potcdate.sin.patch b/x11-packages/gtk3/gtk-3.22.30_po_remove-potcdate.sin.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_po_remove-potcdate.sin.patch rename to x11-packages/gtk3/gtk-3.22.30_po_remove-potcdate.sin.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_tests_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_tests_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_tests_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_tests_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_tests_testappchooser.c.patch b/x11-packages/gtk3/gtk-3.22.30_tests_testappchooser.c.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_tests_testappchooser.c.patch rename to x11-packages/gtk3/gtk-3.22.30_tests_testappchooser.c.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_tests_visuals_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_tests_visuals_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_tests_visuals_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_tests_visuals_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_a11y_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_a11y_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_a11y_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_a11y_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_a11y_state_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_a11y_state_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_a11y_state_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_a11y_state_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_css_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_css_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_css_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_css_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_css_nodes_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_css_nodes_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_css_nodes_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_css_nodes_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_css_parser_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_css_parser_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_css_parser_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_css_parser_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_css_style_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_css_style_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_css_style_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_css_style_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_gdk_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_gdk_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_gdk_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_gdk_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_gtk_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_gtk_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_gtk_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_gtk_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_reftests_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_reftests_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_reftests_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_reftests_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-3.22.30_testsuite_tools_Makefile.in.patch b/x11-packages/gtk3/gtk-3.22.30_testsuite_tools_Makefile.in.patch similarity index 100% rename from x11-packages/libgtk3/gtk-3.22.30_testsuite_tools_Makefile.in.patch rename to x11-packages/gtk3/gtk-3.22.30_testsuite_tools_Makefile.in.patch diff --git a/x11-packages/libgtk3/gtk-update-icon-cache.subpackage.sh b/x11-packages/gtk3/gtk-update-icon-cache.subpackage.sh similarity index 100% rename from x11-packages/libgtk3/gtk-update-icon-cache.subpackage.sh rename to x11-packages/gtk3/gtk-update-icon-cache.subpackage.sh diff --git a/x11-packages/libgtk3/postinst b/x11-packages/gtk3/postinst similarity index 100% rename from x11-packages/libgtk3/postinst rename to x11-packages/gtk3/postinst diff --git a/x11-packages/libgtk3/postrm b/x11-packages/gtk3/postrm similarity index 100% rename from x11-packages/libgtk3/postrm rename to x11-packages/gtk3/postrm diff --git a/x11-packages/libgtk3/triggers b/x11-packages/gtk3/triggers similarity index 100% rename from x11-packages/libgtk3/triggers rename to x11-packages/gtk3/triggers diff --git a/x11-packages/libepoxy/build.sh b/x11-packages/libepoxy/build.sh index 49ceae2aa..5f4ac483a 100644 --- a/x11-packages/libepoxy/build.sh +++ b/x11-packages/libepoxy/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://github.com/anholt/libepoxy TERMUX_PKG_DESCRIPTION="Library handling OpenGL function pointer management" TERMUX_PKG_VERSION=1.5.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/anholt/libepoxy/releases/download/${TERMUX_PKG_VERSION}/libepoxy-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8 -TERMUX_PKG_DEPENDS="libmesa" +TERMUX_PKG_DEPENDS="mesa" termux_step_pre_configure () { export EGL_CFLAGS=${CFLAGS} diff --git a/x11-packages/libmesa/build.sh b/x11-packages/mesa/build.sh similarity index 93% rename from x11-packages/libmesa/build.sh rename to x11-packages/mesa/build.sh index e7dc092ee..cb329e917 100644 --- a/x11-packages/libmesa/build.sh +++ b/x11-packages/mesa/build.sh @@ -4,13 +4,15 @@ TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specification" ## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'. TERMUX_PKG_VERSION=17.3.9 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479 TERMUX_PKG_DEPENDS="libandroid-shmem, libexpat, libdrm, libx11, libxdamage, libxext, libxml2, libxshmfence" TERMUX_PKG_BUILD_DEPENDS="xorgproto" TERMUX_PKG_DEVPACKAGE_DEPENDS="xorgproto" +TERMUX_PKG_CONFLICTS="libmesa" +TERMUX_PKG_REPLACES="libmesa" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-asm diff --git a/x11-packages/mtpaint/build.sh b/x11-packages/mtpaint/build.sh index 8c21753f9..3cce6aa3d 100644 --- a/x11-packages/mtpaint/build.sh +++ b/x11-packages/mtpaint/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://mtpaint.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Simple paint program for creating icons and pixel based artwork" TERMUX_PKG_VERSION=3.40 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/mtpaint/mtpaint-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890 -TERMUX_PKG_DEPENDS="giflib, libandroid-glob, libgtk2, littlecms" +TERMUX_PKG_DEPENDS="giflib, gtk2, libandroid-glob, littlecms" TERMUX_PKG_RECOMMENDS="gifsicle" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=${TERMUX_PREFIX}/share/man man GIF jpeg tiff cflags lcms2" diff --git a/x11-packages/qemu-system-x86_64/build.sh b/x11-packages/qemu-system-x86_64/build.sh index 11deacb10..b73df8def 100644 --- a/x11-packages/qemu-system-x86_64/build.sh +++ b/x11-packages/qemu-system-x86_64/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.qemu.org TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator (x86_64)" TERMUX_PKG_VERSION=2.12.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=33583800e0006cd00b78226b85be5a27c8e3b156bed2e60e83ecbeb7b9b8364f -TERMUX_PKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_PKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libssh2, libutil, ncurses, qemu-common, sdl2" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL=" diff --git a/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh index ef12a0dbf..f97650771 100644 --- a/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh +++ b/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh @@ -3,5 +3,5 @@ bin/qemu-system-aarch64 share/man/man1/qemu-system-aarch64.1 " -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libssh2, libutil, ncurses, qemu-common, sdl2" TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator (aarch64)" diff --git a/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh index dc4b47e77..72ca10371 100644 --- a/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh +++ b/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh @@ -3,5 +3,5 @@ bin/qemu-system-arm share/man/man1/qemu-system-arm.1 " -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libssh2, libutil, ncurses, qemu-common, sdl2" TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator (arm)" diff --git a/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh index d481c64d6..4ec06f3d0 100644 --- a/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh +++ b/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh @@ -3,5 +3,5 @@ bin/qemu-system-i386 share/man/man1/qemu-system-i386.1 " -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libssh2, libutil, ncurses, qemu-common, sdl2" TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (i386)" diff --git a/x11-packages/riscvemu-sdl/build.sh b/x11-packages/riscvemu/build.sh similarity index 81% rename from x11-packages/riscvemu-sdl/build.sh rename to x11-packages/riscvemu/build.sh index aee338f8f..390107c03 100644 --- a/x11-packages/riscvemu-sdl/build.sh +++ b/x11-packages/riscvemu/build.sh @@ -2,18 +2,15 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://bellard.org/riscvemu/ TERMUX_PKG_DESCRIPTION="RISC-V system emulator" - _COMMIT=d81d3be5b15ae8506668bace1cde82cf0e04a26e TERMUX_PKG_VERSION=20170806 -TERMUX_PKG_REVISION=5 - +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/xeffyr/riscvemu/archive/${_COMMIT}.tar.gz TERMUX_PKG_SHA256=a1c806f8436fb82fa49accc337263bf65292f7d92edd8ab94624c3e816502a87 -TERMUX_PKG_DEPENDS="libcurl, libsdl, openssl" -TERMUX_PKG_CONFLICTS="riscvemu" -TERMUX_PKG_REPLACES="riscvemu" -TERMUX_PKG_PROVIDES="riscvemu" +TERMUX_PKG_DEPENDS="libcurl, openssl, sdl" +TERMUX_PKG_CONFLICTS="riscvemu-sdl" +TERMUX_PKG_REPLACES="riscvemu-sdl" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DUSE_NETWORK_FILESYSTEM=y diff --git a/x11-packages/riscvemu-sdl/postinst b/x11-packages/riscvemu/postinst similarity index 100% rename from x11-packages/riscvemu-sdl/postinst rename to x11-packages/riscvemu/postinst diff --git a/x11-packages/libsdl-net/build.sh b/x11-packages/sdl-net/build.sh similarity index 76% rename from x11-packages/libsdl-net/build.sh rename to x11-packages/sdl-net/build.sh index 744c4ea77..583f23355 100644 --- a/x11-packages/libsdl-net/build.sh +++ b/x11-packages/sdl-net/build.sh @@ -3,7 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.libsdl.org/projects/SDL_net/ TERMUX_PKG_DESCRIPTION="A small sample cross-platform networking library" TERMUX_PKG_VERSION=1.2.8 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://www.libsdl.org/projects/SDL_net/release/SDL_net-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 -TERMUX_PKG_DEPENDS="libpulseaudio, libsdl" + +TERMUX_PKG_DEPENDS="libpulseaudio, sdl" +TERMUX_PKG_CONFLICTS="libsdl-net" +TERMUX_PKG_REPLACES="libsdl-net" diff --git a/x11-packages/libsdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch b/x11-packages/sdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch b/x11-packages/sdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_SDL_gamma.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_SDL_gamma.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_SDL_gamma.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_SDL_gamma.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch b/x11-packages/sdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch diff --git a/x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch similarity index 100% rename from x11-packages/libsdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch rename to x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch diff --git a/x11-packages/libsdl/build.sh b/x11-packages/sdl/build.sh similarity index 72% rename from x11-packages/libsdl/build.sh rename to x11-packages/sdl/build.sh index af80ca208..439078674 100644 --- a/x11-packages/libsdl/build.sh +++ b/x11-packages/sdl/build.sh @@ -3,8 +3,17 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.libsdl.org TERMUX_PKG_DESCRIPTION="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" TERMUX_PKG_VERSION=1.2.15 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 + TERMUX_PKG_DEPENDS="libx11, libxext, libxrandr, libxrender, pulseaudio" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-assembly --disable-nasm --disable-pth --disable-video-opengl" +TERMUX_PKG_CONFLICTS="libsdl" +TERMUX_PKG_REPLACES="libsdl" + +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--disable-assembly +--disable-nasm +--disable-pth +--disable-video-opengl +" diff --git a/x11-packages/libsdl2/SDL2-2.0.8_configure.patch b/x11-packages/sdl2/SDL2-2.0.8_configure.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_configure.patch rename to x11-packages/sdl2/SDL2-2.0.8_configure.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_config.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_config.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_config.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_config.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_egl.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_egl.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_egl.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_egl.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_main.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_main.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_main.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_main.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_platform.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_platform.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_platform.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_platform.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_rwops.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_rwops.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_rwops.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_rwops.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_stdinc.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_stdinc.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_stdinc.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_stdinc.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_include_SDL_system.h.patch b/x11-packages/sdl2/SDL2-2.0.8_include_SDL_system.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_include_SDL_system.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_include_SDL_system.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_SDL.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_SDL.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_SDL.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_SDL.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_SDL_log.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_SDL_log.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_SDL_log.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_SDL_log.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_atomic_SDL_atomic.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_atomic_SDL_atomic.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_atomic_SDL_atomic.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_atomic_SDL_atomic.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi_procs.h.patch b/x11-packages/sdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi_procs.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi_procs.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_dynapi_SDL_dynapi_procs.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_file_SDL_rwops.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_file_SDL_rwops.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_file_SDL_rwops.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_file_SDL_rwops.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_joystick_SDL_gamecontroller.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_joystick_SDL_gamecontroller.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_joystick_SDL_gamecontroller.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_joystick_SDL_gamecontroller.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_joystick_SDL_gamecontrollerdb.h.patch b/x11-packages/sdl2/SDL2-2.0.8_src_joystick_SDL_gamecontrollerdb.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_joystick_SDL_gamecontrollerdb.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_joystick_SDL_gamecontrollerdb.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_joystick_SDL_sysjoystick.h.patch b/x11-packages/sdl2/SDL2-2.0.8_src_joystick_SDL_sysjoystick.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_joystick_SDL_sysjoystick.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_joystick_SDL_sysjoystick.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_stdlib_SDL_getenv.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_stdlib_SDL_getenv.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_stdlib_SDL_getenv.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_stdlib_SDL_getenv.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_thread_pthread_SDL_systhread.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_thread_pthread_SDL_systhread.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_thread_pthread_SDL_systhread.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_thread_pthread_SDL_systhread.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_video_SDL_video.c.patch b/x11-packages/sdl2/SDL2-2.0.8_src_video_SDL_video.c.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_video_SDL_video.c.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_video_SDL_video.c.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_video_khronos_KHR_khrplatform.h.patch b/x11-packages/sdl2/SDL2-2.0.8_src_video_khronos_KHR_khrplatform.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_video_khronos_KHR_khrplatform.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_video_khronos_KHR_khrplatform.h.patch diff --git a/x11-packages/libsdl2/SDL2-2.0.8_src_video_khronos_vulkan_vk_platform.h.patch b/x11-packages/sdl2/SDL2-2.0.8_src_video_khronos_vulkan_vk_platform.h.patch similarity index 100% rename from x11-packages/libsdl2/SDL2-2.0.8_src_video_khronos_vulkan_vk_platform.h.patch rename to x11-packages/sdl2/SDL2-2.0.8_src_video_khronos_vulkan_vk_platform.h.patch diff --git a/x11-packages/libsdl2/build.sh b/x11-packages/sdl2/build.sh similarity index 94% rename from x11-packages/libsdl2/build.sh rename to x11-packages/sdl2/build.sh index b55769cd1..110ebfdcd 100644 --- a/x11-packages/libsdl2/build.sh +++ b/x11-packages/sdl2/build.sh @@ -3,10 +3,13 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.libsdl.org TERMUX_PKG_DESCRIPTION="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (version 2)" TERMUX_PKG_VERSION=2.0.8 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL2-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec + TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-support, libflac, libogg, libsndfile, libvorbis, libx11, libxau, libxcb, libxdmcp, libxext, libxrandr, libxrender, libxxf86vm, pulseaudio" +TERMUX_PKG_CONFLICTS="libsdl2" +TERMUX_PKG_REPLACES="libsdl2" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --x-includes=${TERMUX_PREFIX}/include diff --git a/x11-packages/the-powder-toy/build.sh b/x11-packages/the-powder-toy/build.sh index bdbab885d..a39131afb 100644 --- a/x11-packages/the-powder-toy/build.sh +++ b/x11-packages/the-powder-toy/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://powdertoy.co.uk/ TERMUX_PKG_DESCRIPTION="The Powder Toy is a free physics sandbox game" TERMUX_PKG_VERSION=93.3 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/ThePowderToy/The-Powder-Toy/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=6c5f5914e4ae0ac8500c7203ec69517a2fd4380dece6b33247ed719aa12e074e -TERMUX_PKG_DEPENDS="fftw, libbz2, libc++, liblua52, libsdl, libx11" +TERMUX_PKG_DEPENDS="fftw, libbz2, libc++, liblua52, sdl, libx11" TERMUX_PKG_FOLDERNAME=The-Powder-Toy-${TERMUX_PKG_VERSION} TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh index 57eb4e968..df26ef210 100644 --- a/x11-packages/tigervnc/build.sh +++ b/x11-packages/tigervnc/build.sh @@ -2,13 +2,13 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/ TERMUX_PKG_VERSION=1.9.0 -TERMUX_PKG_REVISION=10 +TERMUX_PKG_REVISION=11 TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC." TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740 -TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libmesa, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxfixes, libxfont2, libxshmfence, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp" -TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xorg-xvfb, xtrans" +TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxfixes, libxfont2, libxshmfence, mesa, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp" +TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xorg-server-xvfb, xtrans" TERMUX_PKG_FOLDERNAME=tigervnc-${TERMUX_PKG_VERSION} TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_VIEWER=ON -DENABLE_NLS=OFF -DENABLE_PAM=OFF -DENABLE_GNUTLS=ON" @@ -18,7 +18,7 @@ termux_step_pre_configure () { mkdir -p ${TERMUX_PKG_BUILDDIR}/unix/xserver cd ${TERMUX_PKG_BUILDDIR}/unix/xserver - cp -R ${TERMUX_TOPDIR}/xorg-xvfb/src/* ${TERMUX_PKG_BUILDDIR}/unix/xserver/ + cp -R ${TERMUX_TOPDIR}/xorg-server-xvfb/src/* ${TERMUX_PKG_BUILDDIR}/unix/xserver/ patch -p1 -i ${TERMUX_PKG_SRCDIR}/unix/xserver120.patch @@ -35,7 +35,7 @@ termux_step_pre_configure () { --disable-static \ --disable-nls \ --enable-debug \ - `TERMUX_PREFIX=${TERMUX_PREFIX} bash ${TERMUX_SCRIPTDIR}/packages/xorg-xvfb/build.sh xorg_server_flags` + `TERMUX_PREFIX=${TERMUX_PREFIX} bash ${TERMUX_SCRIPTDIR}/packages/xorg-server-xvfb/build.sh xorg_server_flags` LDFLAGS="${LDFLAGS} -landroid-shmem" } diff --git a/x11-packages/wireshark-gtk/build.sh b/x11-packages/wireshark-gtk/build.sh index a0d46fab5..0886ece56 100644 --- a/x11-packages/wireshark-gtk/build.sh +++ b/x11-packages/wireshark-gtk/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.wireshark.org/ TERMUX_PKG_DESCRIPTION="Network protocol analyzer" TERMUX_PKG_VERSION=2.6.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://www.wireshark.org/download/src/wireshark-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=d158a8a626dc0997a826cf12b5316a3d393fb9f93d84cc86e75b212f0044a3ec -TERMUX_PKG_DEPENDS="c-ares, desktop-file-utils, glib, hicolor-icon-theme, libandroid-shmem, libgcrypt, libgnutls, libgtk3, liblua52, liblz4, libmaxminddb, libnghttp2, libnl, libpcap, libssh, libxml2" +TERMUX_PKG_DEPENDS="c-ares, desktop-file-utils, glib, gtk3, hicolor-icon-theme, libandroid-shmem, libgcrypt, libgnutls, liblua52, liblz4, libmaxminddb, libnghttp2, libnl, libpcap, libssh, libxml2" TERMUX_PKG_CONFLICTS="tshark, wireshark, wireshark-cli" TERMUX_PKG_PROVIDES="tshark, wireshark, wireshark-cli" TERMUX_PKG_REPLACES="tshark, wireshark, wireshark-cli" diff --git a/x11-packages/xarchiver/build.sh b/x11-packages/xarchiver/build.sh index df44c5d23..1988a48c7 100644 --- a/x11-packages/xarchiver/build.sh +++ b/x11-packages/xarchiver/build.sh @@ -3,8 +3,8 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://github.com/ib/xarchiver TERMUX_PKG_DESCRIPTION="GTK+ frontend to various command line archivers" TERMUX_PKG_VERSION=0.5.4.13 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/ib/xarchiver/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=617154435731554b793ab00cc373d957c066dc29444c6189029299a89430776c -TERMUX_PKG_DEPENDS="binutils, bzip2, cpio, gzip, libgtk3, lzip, lzop, p7zip, tar, unrar, unzip, xz-utils, zip, zstd" +TERMUX_PKG_DEPENDS="binutils, bzip2, cpio, gtk3, gzip, lzip, lzop, p7zip, tar, unrar, unzip, xz-utils, zip, zstd" TERMUX_PKG_RM_AFTER_INSTALL="share/icons/hicolor/icon-theme.cache" diff --git a/x11-packages/xcbproto/build.sh b/x11-packages/xcbproto/build.sh deleted file mode 100644 index 4d86685ad..000000000 --- a/x11-packages/xcbproto/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" - -TERMUX_PKG_HOMEPAGE=https://xcb.freedesktop.org/ -TERMUX_PKG_DESCRIPTION="XML-XCB protocol descriptions" -TERMUX_PKG_VERSION=1.13 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL=https://xcb.freedesktop.org/dist/xcb-proto-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1 -#TERMUX_PKG_RM_AFTER_INSTALL="lib/python2.7" diff --git a/x11-packages/xorg-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh similarity index 86% rename from x11-packages/xorg-xvfb/build.sh rename to x11-packages/xorg-server-xvfb/build.sh index c475880f4..ea97e6c94 100644 --- a/x11-packages/xorg-xvfb/build.sh +++ b/x11-packages/xorg-server-xvfb/build.sh @@ -3,10 +3,14 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X virtual framebuffer" TERMUX_PKG_VERSION=1.20.1 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918 +TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-fonts-75dpi | xorg-fonts-100dpi, xorg-xkbcomp" +TERMUX_PKG_CONFLICTS="xorg-xvfb" +TERMUX_PKG_REPLACES="xorg-xvfb" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-glx --enable-composite @@ -58,10 +62,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-xkb-path=${TERMUX_PREFIX}/share/X11/xkb LIBS=-landroid-shmem" -TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libmesa, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, openssl, xkeyboard-config, xorg-fonts-75dpi | xorg-fonts-100dpi, xorg-xkbcomp" -TERMUX_PKG_CONFLICTS="xorg-server" -TERMUX_PKG_REPLACES="xorg-server" - termux_step_pre_configure () { CFLAGS+=" -DFNDELAY=O_NDELAY" CPPFLAGS+=" -I${TERMUX_PREFIX}/include/libdrm" diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_xf86Config.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_acpi.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_os-support_linux_lnx_kmod.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_scan.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_parser_write.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_xorg-wrapper.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xquartz_mach-startup_bundle-main.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xwin_InitOutput.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_include_site.h.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_include_site.h.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_include_site.h.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_include_site.h.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_access.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_access.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_os_access.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_access.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_backtrace.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_backtrace.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_os_backtrace.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_backtrace.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_connection.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_connection.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_os_connection.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_connection.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_osinit.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_osinit.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_os_osinit.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_osinit.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_os_utils.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_utils.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_os_utils.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_os_utils.c.patch diff --git a/x11-packages/xorg-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch similarity index 100% rename from x11-packages/xorg-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch rename to x11-packages/xorg-server-xvfb/xorg-server-1.20.1_xkb_ddxLoad.c.patch