p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: p:c221a00c33067cc2c7f1019676de30d849536d6e
Branches Tags
p:master
p:v1.0.0
..
compare: p:bac9fce4e0619d39bb7535610b60e7f4104ed026
Branches Tags
p:master
p:v1.0.0

No commits in common. "c221a00c33067cc2c7f1019676de30d849536d6e" and "bac9fce4e0619d39bb7535610b60e7f4104ed026" have entirely different histories.
c221a00c33 ... bac9fce4e0

2 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
fiv-view.c
View File

@ -962,8 +962,6 @@ gl_draw(FivView *self, cairo_t *cr)
// XXX: Native GdkWindows send this to the software fallback path. // XXX: Native GdkWindows send this to the software fallback path.
// XXX: This only reliably alpha blends when using the software fallback, // XXX: This only reliably alpha blends when using the software fallback,
// such as with a native window, because 7237f5d in GTK+ 3 is a regression. // such as with a native window, because 7237f5d in GTK+ 3 is a regression.
// (Introduced in 3.24.39, reverted in 3.24.42.)
//
// We had to resort to rendering the checkerboard pattern in the shader. // We had to resort to rendering the checkerboard pattern in the shader.
// Unfortunately, it is hard to retrieve the theme colours from CSS. // Unfortunately, it is hard to retrieve the theme colours from CSS.
GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(self)); GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(self));

6
meson.build
View File

@ -363,12 +363,10 @@ elif meson.is_cross_build()
'ProjectURL' : application_url, 'ProjectURL' : application_url,
}), }),
) )
msi = meson.project_name() + '-' + meson.project_version() + \
'-' + host_machine.cpu() + '.msi'
custom_target('package', custom_target('package',
output : msi, output : 'fiv.msi',
command : [meson.current_source_dir() / 'msys2-package.sh', command : [meson.current_source_dir() / 'msys2-package.sh',
host_machine.cpu(), msi, wxs], host_machine.cpu(), 'fiv.msi', wxs],
env : ['MESON_BUILD_ROOT=' + meson.current_build_dir(), env : ['MESON_BUILD_ROOT=' + meson.current_build_dir(),
'MESON_SOURCE_ROOT=' + meson.current_source_dir()], 'MESON_SOURCE_ROOT=' + meson.current_source_dir()],
console : true, console : true,