wx
This commit is contained in:
		
							parent
							
								
									0faa4e93e6
								
							
						
					
					
						commit
						d3b3de91e4
					
				
					 4 changed files with 64 additions and 50 deletions
				
			
		| 
						 | 
				
			
			@ -11,11 +11,13 @@ kaynak=(https://github.com/vslavik/poedit/releases/download/v$surum-oss/poedit-$
 | 
			
		|||
 | 
			
		||||
derle() {
 | 
			
		||||
  #if komutuyla eğer yoksa demek lazım
 | 
			
		||||
  [ ! -L /usr/bin/wx-config-gtk3 ] && ln -s /usr/bin/wx-config /usr/bin/wx-config-gtk3
 | 
			
		||||
  #[ ! -L /usr/include/wx ] && ln -s /usr/include/wx-3.0/wx /usr/include/wx
 | 
			
		||||
  cd "${SRC}"/${isim}-${surum}
 | 
			
		||||
  GTKSPELL_LIBS="`pkg-config --libs gtkspell3-3.0`" GTKSPELL_CFLAGS="`pkg-config --cflags gtkspell3-3.0`" ./configure \
 | 
			
		||||
  --prefix=/usr --libexecdir=/usr/lib/poedit --with-wx-config=/usr/bin/wx-config-gtk3 
 | 
			
		||||
  GTKSPELL_LIBS="`pkg-config --libs gtkspell3-3.0`" GTKSPELL_CFLAGS="`pkg-config --cflags gtkspell3-3.0`" \
 | 
			
		||||
  ./configure --with-gtk=gtk3 \
 | 
			
		||||
  --prefix=/usr --libexecdir=/usr/lib/poedit --with-wx-config=/usr/bin/wx-config  
 | 
			
		||||
  make CPPFLAGS+=' -DUCHAR_TYPE=uint16_t'
 | 
			
		||||
  make DESTDIR="${PKG}" install
 | 
			
		||||
  install -Dm644 COPYING "${PKG}"/usr/share/licenses/${isim}/LICENSE
 | 
			
		||||
  #[ -L /usr/include/wx ] && rm /usr/include/wx
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,32 +0,0 @@
 | 
			
		|||
# Tanım: Xpdf 3.0'a dayalı PDF işleme kütüphanesi
 | 
			
		||||
# URL: http://poppler.freedesktop.org/
 | 
			
		||||
# Paketçi: alihan-ozturk28@hotmail.com
 | 
			
		||||
# Gerekler: poppler xorg-libxxf86vm libpng xorg-fontconfig libjpeg-turbo cairo libxml2 openjpeg lcms lcms2 qt5
 | 
			
		||||
 | 
			
		||||
isim=poppler-qt5
 | 
			
		||||
surum=0.46.0
 | 
			
		||||
devir=1
 | 
			
		||||
 | 
			
		||||
kaynak=(http://poppler.freedesktop.org/poppler-$surum.tar.xz)
 | 
			
		||||
 | 
			
		||||
derle() {
 | 
			
		||||
    cd poppler-$surum
 | 
			
		||||
    
 | 
			
		||||
    CXXFLAGS="-std=c++11"
 | 
			
		||||
    
 | 
			
		||||
    ./configure --prefix=/usr             \
 | 
			
		||||
            --sysconfdir=/etc             \
 | 
			
		||||
            --disable-static              \
 | 
			
		||||
            --enable-cmyk                 \
 | 
			
		||||
            --enable-qt5                  \
 | 
			
		||||
            --disable-qt4                 \
 | 
			
		||||
            --disable-glib                \
 | 
			
		||||
            --enable-xpdf-headers
 | 
			
		||||
    make
 | 
			
		||||
    make -C poppler DESTDIR=$PKG install-libLTLIBRARIES
 | 
			
		||||
    make -C qt5 DESTDIR=$PKG install
 | 
			
		||||
 | 
			
		||||
    mkdir -p $PKG/usr/lib/pkgconfig
 | 
			
		||||
    install -m644 poppler-qt5.pc $PKG/usr/lib/pkgconfig/
 | 
			
		||||
    rm -f $PKG/usr/lib/libpoppler.*
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -9,26 +9,34 @@ surum=3.0.3.1
 | 
			
		|||
devir=1
 | 
			
		||||
 | 
			
		||||
kaynak=(https://github.com/wxWidgets/wxWidgets/archive/v$surum.tar.gz::wxWidgets-$surum.tar.bz2
 | 
			
		||||
		make-abicheck-non-fatal.patch)
 | 
			
		||||
		https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch::wxgtk-webkit2gtk.patch
 | 
			
		||||
		https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch::wxgtk2-fix-webview.patch
 | 
			
		||||
		https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch::wxgtk-filezilla-assert.patch
 | 
			
		||||
		make-abicheck-non-fatal.patch
 | 
			
		||||
		wxgtk-webkit-infinite-loop.patch)
 | 
			
		||||
		
 | 
			
		||||
derle() {
 | 
			
		||||
	cd wxWidgets-$surum
 | 
			
		||||
	# C++ ABI check is too strict and breaks with GCC 5.1
 | 
			
		||||
	# https://bugzilla.redhat.com/show_bug.cgi?id=1200611
 | 
			
		||||
	patch -Np1 -i ../make-abicheck-non-fatal.patch
 | 
			
		||||
	./configure --prefix=/usr \
 | 
			
		||||
	--libdir=/usr/lib \
 | 
			
		||||
	--with-gtk=2 \
 | 
			
		||||
	--with-opengl \
 | 
			
		||||
	--enable-unicode \
 | 
			
		||||
	--enable-graphics_ctx  \
 | 
			
		||||
	--enable-mediactrl \
 | 
			
		||||
	--enable-webview \
 | 
			
		||||
	--with-regex=builtin \
 | 
			
		||||
	--with-libpng=sys \
 | 
			
		||||
	--with-libxpm=sys \
 | 
			
		||||
	--with-libjpeg=sys \
 | 
			
		||||
	--with-libtiff=sys \
 | 
			
		||||
 | 
			
		||||
	# Support webkit2gtk
 | 
			
		||||
	sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
 | 
			
		||||
	patch -p1 -i ../wxgtk-webkit2gtk.patch
 | 
			
		||||
	# fix webview after webkit2gtk port
 | 
			
		||||
	patch -p1 -i ../wxgtk2-fix-webview.patch
 | 
			
		||||
	# fix assert in FileZilla
 | 
			
		||||
	patch -p1 -i ../wxgtk-filezilla-assert.patch
 | 
			
		||||
	# fix infinite loop in webkit
 | 
			
		||||
	patch -p1 -i ../wxgtk-webkit-infinite-loop.patch
 | 
			
		||||
 | 
			
		||||
	./autogen.sh
 | 
			
		||||
	./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-gtk=3 --with-opengl --enable-unicode \
 | 
			
		||||
	--enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
 | 
			
		||||
	--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
 | 
			
		||||
	--disable-precomp-headers
 | 
			
		||||
	make
 | 
			
		||||
	make -C locale allmo
 | 
			
		||||
	make DESTDIR=$PKG install
 | 
			
		||||
	make DESTDIR="${PKG}" install
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										36
									
								
								talimatname/genel/w/wxgtk/wxgtk-webkit-infinite-loop.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								talimatname/genel/w/wxgtk/wxgtk-webkit-infinite-loop.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,36 @@
 | 
			
		|||
From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Paul Cornett <paulcor@users.noreply.github.com>
 | 
			
		||||
Date: Sat, 6 Jan 2018 11:07:11 -0800
 | 
			
		||||
Subject: [PATCH] Avoid calling default "key-press-event" handler
 | 
			
		||||
 | 
			
		||||
We have already done everything it does, and doing it again seems to
 | 
			
		||||
cause an infinite loop with WebKitGTK. See #17932
 | 
			
		||||
---
 | 
			
		||||
 src/gtk/toplevel.cpp | 10 +++++-----
 | 
			
		||||
 1 file changed, 5 insertions(+), 5 deletions(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
 | 
			
		||||
index f63fdd3e463..ae825d40396 100644
 | 
			
		||||
--- a/src/gtk/toplevel.cpp
 | 
			
		||||
+++ b/src/gtk/toplevel.cpp
 | 
			
		||||
@@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
 | 
			
		||||
     // GTK+ gtk_window_key_press_event() handler.
 | 
			
		||||
 
 | 
			
		||||
     if ( gtk_window_propagate_key_event(window, event) )
 | 
			
		||||
-        return TRUE;
 | 
			
		||||
+        return true;
 | 
			
		||||
 
 | 
			
		||||
     if ( gtk_window_activate_key(window, event) )
 | 
			
		||||
-        return TRUE;
 | 
			
		||||
+        return true;
 | 
			
		||||
 
 | 
			
		||||
-    if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
 | 
			
		||||
-        return TRUE;
 | 
			
		||||
+    GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
 | 
			
		||||
 
 | 
			
		||||
-    return FALSE;
 | 
			
		||||
+    // Avoid calling the default handler, we have already done everything it does
 | 
			
		||||
+    return true;
 | 
			
		||||
 }
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
		Loading…
	
	Add table
		
		Reference in a new issue