cleanup duplicates

Author: Oleksiy-Yakovenko

scripts/static_build.sh

@@ -46,7 +46,7 @@ elif [[ "$ARCH" == "x86_64" ]]; then
 
     export GDK_PIXBUF_LIBS="-L${GTK_ROOT_216}/lib -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
 
-    export GTK3_310_CFLAGS="-I${GTK_ROOT_310}/include/gtk-3.0 -I${GTK_ROOT_310}/include/at-spi2-atk/2.0 -I${GTK_ROOT_310}/include/at-spi-2.0 -I${GTK_ROOT_310}/include/dbus-1.0 -I${GTK_ROOT_310}/lib/dbus-1.0/include -I${GTK_ROOT_310}/include/gtk-3.0 -I${GTK_ROOT_310}/include/gio-unix-2.0/ -I${GTK_ROOT_310}/include/mirclient -I${GTK_ROOT_310}/include/mircore -I${GTK_ROOT_310}/include/mircookie -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/harfbuzz -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/atk-1.0 -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/pixman-1 -I${GTK_ROOT_310}/include/freetype2 -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/gdk-pixbuf-2.0 -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/glib-2.0 -I${GTK_ROOT_310}/lib/glib-2.0/include"
+    export GTK3_310_CFLAGS="-I${GTK_ROOT_310}/include/at-spi-2.0 -I${GTK_ROOT_310}/include/at-spi2-atk/2.0 -I${GTK_ROOT_310}/include/atk-1.0 -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/dbus-1.0 -I${GTK_ROOT_310}/include/freetype2 -I${GTK_ROOT_310}/include/gdk-pixbuf-2.0 -I${GTK_ROOT_310}/include/gio-unix-2.0/ -I${GTK_ROOT_310}/include/glib-2.0 -I${GTK_ROOT_310}/include/gtk-3.0 -I${GTK_ROOT_310}/include/gtk-3.0 -I${GTK_ROOT_310}/include/harfbuzz -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/mirclient -I${GTK_ROOT_310}/include/mircookie -I${GTK_ROOT_310}/include/mircore -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/pixman-1 -I${GTK_ROOT_310}/lib/dbus-1.0/include -I${GTK_ROOT_310}/lib/glib-2.0/include"
     export GTK3_310_LIBS="-L${GTK_ROOT_310}/lib -L${GTK_ROOT_310}/lib/x86_64-linux-gnu -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
 
 # using clang requires higher version of libstdc++, than provided in staticdeps, so remove it
@@ -65,10 +65,10 @@ elif [[ "$ARCH" == "aarch64" ]]; then
 
     export GDK_PIXBUF_LIBS="-L${GTK_ROOT_310}/lib -L${GTK_ROOT_310}/lib/aarch64-linux-gnu -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
 
-    export GTK3_310_CFLAGS="-I${GTK_ROOT_310}/include/gtk-3.0 -I${GTK_ROOT_310}/include/at-spi2-atk/2.0 -I${GTK_ROOT_310}/include/at-spi-2.0 -I${GTK_ROOT_310}/include/dbus-1.0 -I${GTK_ROOT_310}/lib/dbus-1.0/include -I${GTK_ROOT_310}/include/gio-unix-2.0/ -I${GTK_ROOT_310}/include/mirclient -I${GTK_ROOT_310}/include/mircore -I${GTK_ROOT_310}/include/mircookie -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/harfbuzz -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/atk-1.0 -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/pixman-1 -I${GTK_ROOT_310}/include/freetype2 -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/gdk-pixbuf-2.0 -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/glib-2.0 -I${GTK_ROOT_310}/lib/aarch64-linux-gnu/glib-2.0/include"
+    export GTK3_310_CFLAGS="-I${GTK_ROOT_310}/include/at-spi-2.0 -I${GTK_ROOT_310}/include/at-spi2-atk/2.0 -I${GTK_ROOT_310}/include/atk-1.0 -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/dbus-1.0 -I${GTK_ROOT_310}/include/freetype2 -I${GTK_ROOT_310}/include/gdk-pixbuf-2.0 -I${GTK_ROOT_310}/include/gio-unix-2.0/ -I${GTK_ROOT_310}/include/glib-2.0 -I${GTK_ROOT_310}/include/gtk-3.0 -I${GTK_ROOT_310}/include/harfbuzz -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/mirclient -I${GTK_ROOT_310}/include/mircookie -I${GTK_ROOT_310}/include/mircore -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/pixman-1 -I${GTK_ROOT_310}/lib/aarch64-linux-gnu/glib-2.0/include -I${GTK_ROOT_310}/lib/dbus-1.0/include"
     export GTK3_310_LIBS="-L${GTK_ROOT_310}/lib -L${GTK_ROOT_310}/lib/aarch64-linux-gnu -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
 
-    export GTK2_216_CFLAGS="-I${GTK_ROOT_310}/include/gtk-2.0 -I${GTK_ROOT_310}/include/at-spi2-atk/2.0 -I${GTK_ROOT_310}/include/at-spi-2.0 -I${GTK_ROOT_310}/include/dbus-1.0 -I${GTK_ROOT_310}/lib/dbus-1.0/include -I${GTK_ROOT_310}/include/gio-unix-2.0/ -I${GTK_ROOT_310}/include/mirclient -I${GTK_ROOT_310}/include/mircore -I${GTK_ROOT_310}/include/mircookie -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/harfbuzz -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/atk-1.0 -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/pixman-1 -I${GTK_ROOT_310}/include/freetype2 -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/gdk-pixbuf-2.0 -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/glib-2.0 -I${GTK_ROOT_310}/lib/aarch64-linux-gnu/glib-2.0/include -I${GTK_ROOT_310}/lib/aarch64-linux-gnu/gtk-2.0/include"
+    export GTK2_216_CFLAGS="-I${GTK_ROOT_310}/include/at-spi-2.0 -I${GTK_ROOT_310}/include/at-spi2-atk/2.0 -I${GTK_ROOT_310}/include/atk-1.0 -I${GTK_ROOT_310}/include/cairo -I${GTK_ROOT_310}/include/dbus-1.0 -I${GTK_ROOT_310}/include/freetype2 -I${GTK_ROOT_310}/include/gdk-pixbuf-2.0 -I${GTK_ROOT_310}/include/gio-unix-2.0/ -I${GTK_ROOT_310}/include/glib-2.0 -I${GTK_ROOT_310}/include/gtk-2.0 -I${GTK_ROOT_310}/include/harfbuzz -I${GTK_ROOT_310}/include/libpng12 -I${GTK_ROOT_310}/include/mirclient -I${GTK_ROOT_310}/include/mircookie -I${GTK_ROOT_310}/include/mircore -I${GTK_ROOT_310}/include/pango-1.0 -I${GTK_ROOT_310}/include/pixman-1 -I${GTK_ROOT_310}/lib/aarch64-linux-gnu/glib-2.0/include -I${GTK_ROOT_310}/lib/aarch64-linux-gnu/gtk-2.0/include" -I${GTK_ROOT_310}/lib/dbus-1.0/include"
     export GTK2_216_LIBS="-L${GTK_ROOT_216}/lib -L${GTK_ROOT_216}/lib/aarch64-linux-gnu -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
 
 # using clang requires higher version of libstdc++, than provided in staticdeps, so remove it